Title: [197305] trunk/Source/_javascript_Core
Revision
197305
Author
[email protected]
Date
2016-02-28 17:44:26 -0800 (Sun, 28 Feb 2016)

Log Message

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.

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (197304 => 197305)


--- trunk/Source/_javascript_Core/ChangeLog	2016-02-29 00:32:24 UTC (rev 197304)
+++ trunk/Source/_javascript_Core/ChangeLog	2016-02-29 01:44:26 UTC (rev 197305)
@@ -1,5 +1,16 @@
 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: trunk/Source/_javascript_Core/bytecode/UnlinkedCodeBlock.cpp (197304 => 197305)


--- trunk/Source/_javascript_Core/bytecode/UnlinkedCodeBlock.cpp	2016-02-29 00:32:24 UTC (rev 197304)
+++ trunk/Source/_javascript_Core/bytecode/UnlinkedCodeBlock.cpp	2016-02-29 01:44:26 UTC (rev 197305)
@@ -265,8 +265,15 @@
 
 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