Title: [152314] trunk/Source/_javascript_Core
- Revision
- 152314
- Author
- [email protected]
- Date
- 2013-07-02 12:47:53 -0700 (Tue, 02 Jul 2013)
Log Message
Replace RELEASE_ASSERT with ASSERT in CodeBlock:: bytecodeOffsetForCallAtIndex
https://bugs.webkit.org/show_bug.cgi?id=118316
Reviewed by Geoffrey Garen.
This is causing some crashiness in release builds. We should replace it with an ASSERT
until we track down all the places that need fixing in bug 118315.
* bytecode/CodeBlock.h:
(JSC::CodeBlock::bytecodeOffsetForCallAtIndex):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (152313 => 152314)
--- trunk/Source/_javascript_Core/ChangeLog 2013-07-02 19:30:32 UTC (rev 152313)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-07-02 19:47:53 UTC (rev 152314)
@@ -1,3 +1,16 @@
+2013-07-02 Mark Hahnenberg <[email protected]>
+
+ Replace RELEASE_ASSERT with ASSERT in CodeBlock:: bytecodeOffsetForCallAtIndex
+ https://bugs.webkit.org/show_bug.cgi?id=118316
+
+ Reviewed by Geoffrey Garen.
+
+ This is causing some crashiness in release builds. We should replace it with an ASSERT
+ until we track down all the places that need fixing in bug 118315.
+
+ * bytecode/CodeBlock.h:
+ (JSC::CodeBlock::bytecodeOffsetForCallAtIndex):
+
2013-07-02 Brent Fulgham <[email protected]>
[Windows] Unreviewed build correction for 'DebugSuffix' target.
Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.h (152313 => 152314)
--- trunk/Source/_javascript_Core/bytecode/CodeBlock.h 2013-07-02 19:30:32 UTC (rev 152313)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.h 2013-07-02 19:47:53 UTC (rev 152314)
@@ -223,7 +223,10 @@
Vector<CallReturnOffsetToBytecodeOffset, 0, UnsafeVectorOverflow>& callIndices = m_rareData->m_callReturnIndexVector;
if (!callIndices.size())
return 1;
- RELEASE_ASSERT(index < m_rareData->m_callReturnIndexVector.size());
+ // FIXME: Fix places in DFG that call out to C that don't set the CodeOrigin. https://bugs.webkit.org/show_bug.cgi?id=118315
+ ASSERT(index < m_rareData->m_callReturnIndexVector.size());
+ if (index >= m_rareData->m_callReturnIndexVector.size())
+ return 1;
return m_rareData->m_callReturnIndexVector[index].bytecodeOffset;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
