Imported WebKit commit 42d95198c30c2d1a94a5081181aad0b2be7c316c (http://svn.webkit.org/repository/webkit/trunk@128206)

This includes the rewrite of the configure part of the build system which should fix the QtQuick2 detection
and allow for further simplifications in the future

1 files changed, 4 insertions, 4 deletions

diff --git a/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp b/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp
index b96b8d9a3..201c42e71 100644
--- a/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp
+++ b/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp
@@ -2855,13 +2855,13 @@ bool ByteCodeParser::parseBlock(unsigned limit)
         }
             
         case op_tear_off_activation: {
-            addToGraph(TearOffActivation, OpInfo(unmodifiedArgumentsRegister(currentInstruction[2].u.operand)), get(currentInstruction[1].u.operand), get(currentInstruction[2].u.operand));
+            addToGraph(TearOffActivation, get(currentInstruction[1].u.operand));
             NEXT_OPCODE(op_tear_off_activation);
         }
-            
+
         case op_tear_off_arguments: {
             m_graph.m_hasArguments = true;
-            addToGraph(TearOffArguments, get(unmodifiedArgumentsRegister(currentInstruction[1].u.operand)));
+            addToGraph(TearOffArguments, get(unmodifiedArgumentsRegister(currentInstruction[1].u.operand)), get(currentInstruction[2].u.operand));
             NEXT_OPCODE(op_tear_off_arguments);
         }
             
@@ -3191,7 +3191,7 @@ ByteCodeParser::InlineStackEntry::InlineStackEntry(
                 inlineCallFrame.capturedVars.set(i);
         }
         
-        if (codeBlock->usesArguments() || codeBlock->needsActivation()) {
+        if (codeBlock->argumentsAreCaptured()) {
             for (int i = argumentCountIncludingThis; i--;)
                 inlineCallFrame.capturedVars.set(argumentToOperand(i) + inlineCallFrame.stackOffset);
         }