Title: [114251] branches/safari-534.57-branch/Source/_javascript_Core
- Revision
- 114251
- Author
- lforsch...@apple.com
- Date
- 2012-04-16 07:20:52 -0700 (Mon, 16 Apr 2012)
Log Message
Merged r112966.
Modified Paths
Diff
Modified: branches/safari-534.57-branch/Source/_javascript_Core/ChangeLog (114250 => 114251)
--- branches/safari-534.57-branch/Source/_javascript_Core/ChangeLog 2012-04-16 14:17:33 UTC (rev 114250)
+++ branches/safari-534.57-branch/Source/_javascript_Core/ChangeLog 2012-04-16 14:20:52 UTC (rev 114251)
@@ -1,3 +1,19 @@
+2012-04-16 Lucas Forschler <lforsch...@apple.com>
+
+ Merge 112966
+
+ 2012-04-02 Oliver Hunt <oli...@apple.com>
+
+ Incorrect liveness information when inlining
+ https://bugs.webkit.org/show_bug.cgi?id=82985
+
+ Reviewed by Filip Pizlo.
+
+ Don't remap register numbers that have already been remapped.
+
+ * dfg/DFGByteCodeParser.cpp:
+ (JSC::DFG::ByteCodeParser::handleInlining):
+
2012-03-20 Lucas Forschler <lforsch...@apple.com>
Merge 107647
Modified: branches/safari-534.57-branch/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp (114250 => 114251)
--- branches/safari-534.57-branch/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp 2012-04-16 14:17:33 UTC (rev 114250)
+++ branches/safari-534.57-branch/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp 2012-04-16 14:20:52 UTC (rev 114251)
@@ -1053,7 +1053,7 @@
// Make sure that the area used by the call frame is reserved.
for (int arg = inlineCallFrameStart + RegisterFile::CallFrameHeaderSize + codeBlock->m_numVars; arg-- > inlineCallFrameStart;)
- m_preservedVars.set(m_inlineStackTop->remapOperand(arg));
+ m_preservedVars.set(arg);
// Make sure that we have enough locals.
unsigned newNumLocals = inlineCallFrameStart + RegisterFile::CallFrameHeaderSize + codeBlock->m_numCalleeRegisters;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
