[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

oliver at apple.com oliver at apple.com
Wed Dec 22 14:11:19 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 00a89d0224fd73f4e5bfeb81bd110a1fb3d51dc7
Author: oliver at apple.com <oliver at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 5 08:28:53 2010 +0000

    2010-10-05  Oliver Hunt  <oliver at apple.com>
    
            Reviewed by Darin Adler.
    
            REGRESSION(r68338): JavaScript error on PowerPC only (crashes on Interpreter built for x86_64)
            https://bugs.webkit.org/show_bug.cgi?id=46690
    
            Use the correct register value when initialising the arguments
            object in the interpreter.  This is covered by existing tests.
    
            * interpreter/Interpreter.cpp:
            (JSC::Interpreter::privateExecute):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69096 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 07eaf66..242c439 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-05  Oliver Hunt  <oliver at apple.com>
+
+        Reviewed by Darin Adler.
+
+        REGRESSION(r68338): JavaScript error on PowerPC only (crashes on Interpreter built for x86_64)
+        https://bugs.webkit.org/show_bug.cgi?id=46690
+
+        Use the correct register value when initialising the arguments
+        object in the interpreter.  This is covered by existing tests.
+
+        * interpreter/Interpreter.cpp:
+        (JSC::Interpreter::privateExecute):
+
 2010-10-04  David Goodwin  <david_goodwin at apple.com>
 
         Reviewed by Oliver Hunt.
diff --git a/JavaScriptCore/interpreter/Interpreter.cpp b/JavaScriptCore/interpreter/Interpreter.cpp
index fedc3b7..ecff7d6 100644
--- a/JavaScriptCore/interpreter/Interpreter.cpp
+++ b/JavaScriptCore/interpreter/Interpreter.cpp
@@ -3173,8 +3173,8 @@ skip_id_custom_self:
         }
         if (!arguments) {
             Arguments* arguments = new (globalData) Arguments(callFrame);
-            callFrame->r(dst) = JSValue(arguments);
-            callFrame->r(unmodifiedArgumentsRegister(dst)) = JSValue(arguments);
+            callFrame->r(argumentsRegister) = JSValue(arguments);
+            callFrame->r(unmodifiedArgumentsRegister(argumentsRegister)) = JSValue(arguments);
         }
         // fallthrough
     }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list