Changeset 180903 in webkit for trunk/Source/JavaScriptCore/ftl/FTLCompile.cpp

Timestamp:

Mar 2, 2015, 3:49:29 PM (10 years ago)

Author:

[email protected]

Message:

FTL should correctly document where it puts the argument count for inlined varargs frames
​https://bugs.webkit.org/show_bug.cgi?id=142187

Reviewed by Geoffrey Garn.

After LLVM tells us where the captured variables alloca landed in the frame, we need to
tell all of our meta-data about it. We were forgetting to do so for the argument count
register, which is used by inlined varargs calls.

• ftl/FTLCompile.cpp:

(JSC::FTL::mmAllocateDataSection):

• tests/stress/inline-varargs-get-arguments.js: Added.

(foo):
(bar):
(baz):

File:

• trunk/Source/JavaScriptCore/ftl/FTLCompile.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ftl/FTLCompile.cpp

@@ -304 +304 @@
         InlineCallFrame* inlineCallFrame = graph.m_inlineVariableData[i].inlineCallFrame;
         
-        if (inlineCallFrame->argumentsRegister.isValid()) {
-            inlineCallFrame->argumentsRegister = VirtualRegister(
-                inlineCallFrame->argumentsRegister.offset() + localsOffset);
-        }
+        if (inlineCallFrame->argumentsRegister.isValid())
+            inlineCallFrame->argumentsRegister += localsOffset;
+        
+        if (inlineCallFrame->argumentCountRegister.isValid())
+            inlineCallFrame->argumentCountRegister += localsOffset;
         
         for (unsigned argument = inlineCallFrame->arguments.size(); argument-- > 1;) {