Title: [152467] branches/safari-537-branch/Source/_javascript_Core
- Revision
- 152467
- Author
- [email protected]
- Date
- 2013-07-08 15:57:27 -0700 (Mon, 08 Jul 2013)
Log Message
Merged r152314. <rdar://problem/14165332>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/_javascript_Core/ChangeLog (152466 => 152467)
--- branches/safari-537-branch/Source/_javascript_Core/ChangeLog 2013-07-08 21:24:33 UTC (rev 152466)
+++ branches/safari-537-branch/Source/_javascript_Core/ChangeLog 2013-07-08 22:57:27 UTC (rev 152467)
@@ -1,3 +1,20 @@
+2013-07-08 Lucas Forschler <[email protected]>
+
+ Merge r152314
+
+ 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-01 Lucas Forschler <[email protected]>
Merge r152091
Modified: branches/safari-537-branch/Source/_javascript_Core/bytecode/CodeBlock.h (152466 => 152467)
--- branches/safari-537-branch/Source/_javascript_Core/bytecode/CodeBlock.h 2013-07-08 21:24:33 UTC (rev 152466)
+++ branches/safari-537-branch/Source/_javascript_Core/bytecode/CodeBlock.h 2013-07-08 22:57:27 UTC (rev 152467)
@@ -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
