[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

mjs at apple.com mjs at apple.com
Tue Jan 5 23:43:07 UTC 2010


The following commit has been merged in the webkit-1.1 branch:
commit 11e33e1d8b40475f4dfcb949896517dedd7a5f91
Author: mjs at apple.com <mjs at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Dec 6 09:57:05 2009 +0000

    Not reviewed, build fix.
    
    Really fix 64-bit build for prior patch.
    
    * jit/JITArithmetic.cpp:
    (JSC::JIT::emitSlow_op_jless):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51737 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index eb1ca93..c6d24b6 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -2,6 +2,15 @@
 
         Not reviewed, build fix.
 
+        Really fix 64-bit build for prior patch.
+
+        * jit/JITArithmetic.cpp:
+        (JSC::JIT::emitSlow_op_jless):
+
+2009-12-06  Maciej Stachowiak  <mjs at apple.com>
+
+        Not reviewed, build fix.
+
         Fix 64-bit build for prior patch.
 
         * jit/JITOpcodes.cpp:
diff --git a/JavaScriptCore/jit/JITArithmetic.cpp b/JavaScriptCore/jit/JITArithmetic.cpp
index cef5188..1b9e55e 100644
--- a/JavaScriptCore/jit/JITArithmetic.cpp
+++ b/JavaScriptCore/jit/JITArithmetic.cpp
@@ -1707,7 +1707,7 @@ void JIT::emitSlow_op_jless(Instruction* currentInstruction, Vector<SlowCaseEntr
         stubCall.addArgument(regT0);
         stubCall.addArgument(regT1);
         stubCall.call();
-        emitJumpSlowToHot(branchTest32(NotZero, regT0), target);
+        emitJumpSlowToHot(branchTest32(NonZero, regT0), target);
     }
 }
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list