[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 f7b903ec768d5e0bb2337a2c63c29b433bfb0a02
Author: ggaren at apple.com <ggaren at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 20 21:55:06 2009 +0000

    * jit/JITOpcodes.cpp:
    (JSC::JIT::emit_op_next_pname): Slightly tweaked this #ifdef to match the
    size of a JSValue because m_jsStrings is an array of JSValues.
    
    Reviewed by Mark Rowe.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49888 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index d30e194..bbebf9d 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -2,6 +2,14 @@
 
         Reviewed by Mark Rowe.
 
+        * jit/JITOpcodes.cpp:
+        (JSC::JIT::emit_op_next_pname): Slightly tweaked this #ifdef to match the
+        size of a JSValue because m_jsStrings is an array of JSValues.
+
+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.
 
diff --git a/JavaScriptCore/jit/JITOpcodes.cpp b/JavaScriptCore/jit/JITOpcodes.cpp
index 5836a24..3015c7e 100644
--- a/JavaScriptCore/jit/JITOpcodes.cpp
+++ b/JavaScriptCore/jit/JITOpcodes.cpp
@@ -2501,7 +2501,7 @@ void JIT::emit_op_next_pname(Instruction* currentInstruction)
     loadPtr(addressFor(it), regT1);
     loadPtr(Address(regT1, OBJECT_OFFSETOF(JSPropertyNameIterator, m_jsStrings)), regT2);
 
-#if PLATFORM(X86_64)
+#if USE(JSVALUE64)
     loadPtr(BaseIndex(regT2, regT0, TimesEight), regT2);
 #else
     loadPtr(BaseIndex(regT2, regT0, TimesFour), regT2);

-- 
WebKit Debian packaging