Title: [197348] releases/WebKitGTK/webkit-2.12/Source/_javascript_Core
Revision
197348
Author
[email protected]
Date
2016-02-29 05:32:10 -0800 (Mon, 29 Feb 2016)

Log Message

Revert "Merge r197305 - REGRESSION(r197303): 4 jsc tests failing on bots."

This reverts commit 497aed24c9437e5d994322493011412097672fab.

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.12/Source/_javascript_Core/ChangeLog (197347 => 197348)


--- releases/WebKitGTK/webkit-2.12/Source/_javascript_Core/ChangeLog	2016-02-29 13:01:51 UTC (rev 197347)
+++ releases/WebKitGTK/webkit-2.12/Source/_javascript_Core/ChangeLog	2016-02-29 13:32:10 UTC (rev 197348)
@@ -1,16 +1,5 @@
 2016-02-28  Andreas Kling  <[email protected]>
 
-        REGRESSION(r197303): 4 jsc tests failing on bots.
-
-        Unreviewed follow-up fix.
-
-        * bytecode/UnlinkedCodeBlock.cpp:
-        (JSC::UnlinkedCodeBlock::typeProfilerExpressionInfoForBytecodeOffset): This function
-        can still get called with !m_rareData, in case the type profiler is active but this
-        particular code block doesn't have type profiler data. Handle it gracefully.
-
-2016-02-28  Andreas Kling  <[email protected]>
-
         Shrink UnlinkedCodeBlock a bit.
         <https://webkit.org/b/154797>
 

Modified: releases/WebKitGTK/webkit-2.12/Source/_javascript_Core/bytecode/UnlinkedCodeBlock.cpp (197347 => 197348)


--- releases/WebKitGTK/webkit-2.12/Source/_javascript_Core/bytecode/UnlinkedCodeBlock.cpp	2016-02-29 13:01:51 UTC (rev 197347)
+++ releases/WebKitGTK/webkit-2.12/Source/_javascript_Core/bytecode/UnlinkedCodeBlock.cpp	2016-02-29 13:32:10 UTC (rev 197348)
@@ -265,15 +265,8 @@
 
 bool UnlinkedCodeBlock::typeProfilerExpressionInfoForBytecodeOffset(unsigned bytecodeOffset, unsigned& startDivot, unsigned& endDivot)
 {
+    ASSERT(m_rareData);
     static const bool verbose = false;
-    if (!m_rareData) {
-        if (verbose)
-            dataLogF("Don't have assignment info for offset:%u\n", bytecodeOffset);
-        startDivot = UINT_MAX;
-        endDivot = UINT_MAX;
-        return false;
-    }
-
     auto iter = m_rareData->m_typeProfilerInfoMap.find(bytecodeOffset);
     if (iter == m_rareData->m_typeProfilerInfoMap.end()) {
         if (verbose)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to