From b1e9e47fa11f608ae16bc07f97a2acf95bf80272 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Fri, 1 Jun 2012 10:36:58 +0200
Subject: Imported WebKit commit 499c84c99aa98e9870fa7eaa57db476c6d160d46
 (http://svn.webkit.org/repository/webkit/trunk@119200)

Weekly update :). Particularly relevant changes for Qt are the use of the WebCore image decoders and direct usage
of libpng/libjpeg if available in the system.
---
 Source/JavaScriptCore/bytecode/CodeBlock.cpp | 2 ++
 Source/JavaScriptCore/bytecode/CodeBlock.h   | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'Source/JavaScriptCore/bytecode')

diff --git a/Source/JavaScriptCore/bytecode/CodeBlock.cpp b/Source/JavaScriptCore/bytecode/CodeBlock.cpp
index e3ee2ed41..8ef716028 100644
--- a/Source/JavaScriptCore/bytecode/CodeBlock.cpp
+++ b/Source/JavaScriptCore/bytecode/CodeBlock.cpp
@@ -1021,6 +1021,7 @@ void CodeBlock::dump(ExecState* exec, const Vector<Instruction>::const_iterator&
         }
         case op_method_check: {
             dataLog("[%4d] method_check", location);
+#if ENABLE(JIT)
             if (numberOfMethodCallLinkInfos()) {
                 MethodCallLinkInfo& methodCall = getMethodCallLinkInfo(location);
                 dataLog(" jit(");
@@ -1046,6 +1047,7 @@ void CodeBlock::dump(ExecState* exec, const Vector<Instruction>::const_iterator&
                 }
                 dataLog(")");
             }
+#endif
             dataLog("\n");
             ++it;
             printGetByIdOp(exec, location, it);
diff --git a/Source/JavaScriptCore/bytecode/CodeBlock.h b/Source/JavaScriptCore/bytecode/CodeBlock.h
index ccaca3373..cdc6a19e8 100644
--- a/Source/JavaScriptCore/bytecode/CodeBlock.h
+++ b/Source/JavaScriptCore/bytecode/CodeBlock.h
@@ -462,11 +462,16 @@ namespace JSC {
             return needsFullScopeChain() && codeType() != GlobalCode;
         }
         
-        bool argumentIsCaptured(int) const
+        bool argumentsAreCaptured() const
         {
             return needsActivation() || usesArguments();
         }
         
+        bool argumentIsCaptured(int) const
+        {
+            return argumentsAreCaptured();
+        }
+        
         bool localIsCaptured(InlineCallFrame* inlineCallFrame, int operand) const
         {
             if (!inlineCallFrame)
-- 
cgit v1.2.1