[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[ggaren at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 73f656e0c56ffc6efb4cace19465a7a4bcaee998
Author: ggaren at apple.com <ggaren at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 20 21:49:13 2009 +0000

    Fixed a 64-bit regression caused by the fix for
    https://bugs.webkit.org/show_bug.cgi?id=30570.
    
    Patch by Geoffrey Garen <ggaren at apple.com> on 2009-10-20
    Reviewed by Mark Rowe.
    
    * jit/JITOpcodes.cpp:
    (JSC::JIT::emit_op_next_pname): Use TimesEight stepping on 64-bit, since
    64-bit pointers are eight bytes long.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49887 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 7b22ab7..d30e194 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,16 @@
 2009-10-20  Geoffrey Garen  <ggaren at apple.com>
 
+        Reviewed by Mark Rowe.
+
+        Fixed a 64-bit regression caused by the fix for
+        https://bugs.webkit.org/show_bug.cgi?id=30570.
+
+        * jit/JITOpcodes.cpp:
+        (JSC::JIT::emit_op_next_pname): Use TimesEight stepping on 64-bit, since
+        64-bit pointers are eight bytes long.
+
+2009-10-20  Geoffrey Garen  <ggaren at apple.com>
+
         Reviewed by Sam Weinig.
 
         Refactored DateInstance::msToGregorianDateTime so that a DateInstance's
diff --git a/JavaScriptCore/jit/JITOpcodes.cpp b/JavaScriptCore/jit/JITOpcodes.cpp
index 2547c2e..5836a24 100644
--- a/JavaScriptCore/jit/JITOpcodes.cpp
+++ b/JavaScriptCore/jit/JITOpcodes.cpp
@@ -2500,7 +2500,13 @@ void JIT::emit_op_next_pname(Instruction* currentInstruction)
     // Grab key @ i
     loadPtr(addressFor(it), regT1);
     loadPtr(Address(regT1, OBJECT_OFFSETOF(JSPropertyNameIterator, m_jsStrings)), regT2);
+
+#if PLATFORM(X86_64)
+    loadPtr(BaseIndex(regT2, regT0, TimesEight), regT2);
+#else
     loadPtr(BaseIndex(regT2, regT0, TimesFour), regT2);
+#endif
+
     emitPutVirtualRegister(dst, regT2);
 
     // Increment i

-- 
WebKit Debian packaging