Changeset 197305 in webkit for trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp

Timestamp:

Feb 28, 2016, 5:44:26 PM (9 years ago)

Author:

[email protected]

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.

File:

• trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp

@@ -266 +266 @@
 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()) {