From 88a04ac016f57c2d78e714682445dff2e7db4ade Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Tue, 11 Sep 2012 19:54:20 +0200
Subject: 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
---
 Source/JavaScriptCore/bytecode/CodeBlock.cpp | 7 ++++---
 Source/JavaScriptCore/bytecode/Opcode.h      | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'Source/JavaScriptCore/bytecode')

diff --git a/Source/JavaScriptCore/bytecode/CodeBlock.cpp b/Source/JavaScriptCore/bytecode/CodeBlock.cpp
index f15e5b0dd..d79a37668 100644
--- a/Source/JavaScriptCore/bytecode/CodeBlock.cpp
+++ b/Source/JavaScriptCore/bytecode/CodeBlock.cpp
@@ -45,6 +45,7 @@
 #include "LowLevelInterpreter.h"
 #include "MethodCallLinkStatus.h"
 #include "RepatchBuffer.h"
+#include "SlotVisitorInlineMethods.h"
 #include <stdio.h>
 #include <wtf/StringExtras.h>
 #include <wtf/UnusedParam.h>
@@ -1406,14 +1407,14 @@ void CodeBlock::dump(ExecState* exec, const Vector<Instruction>::const_iterator&
         }
         case op_tear_off_activation: {
             int r0 = (++it)->u.operand;
-            int r1 = (++it)->u.operand;
-            dataLog("[%4d] tear_off_activation\t %s, %s", location, registerName(exec, r0).data(), registerName(exec, r1).data());
+            dataLog("[%4d] tear_off_activation\t %s", location, registerName(exec, r0).data());
             dumpBytecodeCommentAndNewLine(location);
             break;
         }
         case op_tear_off_arguments: {
             int r0 = (++it)->u.operand;
-            dataLog("[%4d] tear_off_arguments %s", location, registerName(exec, r0).data());
+            int r1 = (++it)->u.operand;
+            dataLog("[%4d] tear_off_arguments %s, %s", location, registerName(exec, r0).data(), registerName(exec, r1).data());
             dumpBytecodeCommentAndNewLine(location);
             break;
         }
diff --git a/Source/JavaScriptCore/bytecode/Opcode.h b/Source/JavaScriptCore/bytecode/Opcode.h
index a63cccaec..5cbae8a09 100644
--- a/Source/JavaScriptCore/bytecode/Opcode.h
+++ b/Source/JavaScriptCore/bytecode/Opcode.h
@@ -174,8 +174,8 @@ namespace JSC {
         macro(op_call, 6) \
         macro(op_call_eval, 6) \
         macro(op_call_varargs, 5) \
-        macro(op_tear_off_activation, 3) \
-        macro(op_tear_off_arguments, 2) \
+        macro(op_tear_off_activation, 2) \
+        macro(op_tear_off_arguments, 3) \
         macro(op_ret, 2) \
         macro(op_call_put_result, 3) /* has value profiling */ \
         macro(op_ret_object_or_this, 3) \
-- 
cgit v1.2.1