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

[oliver at apple.com]

The following commit has been merged in the debian/experimental branch:
commit f7d466a40d3accecec6c944ff23edd32a6c14a0c
Author: oliver at apple.com <oliver at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 10 03:29:31 2010 +0000

    Fix Qt/ARM
    
    C++ overload resolution I stab at thee
    
    * jit/JITInlineMethods.h:
    (JSC::JIT::beginUninterruptedSequence):
    (JSC::JIT::endUninterruptedSequence):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65044 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index f5343b9..9436fbc 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,15 @@
 2010-08-09  Oliver Hunt  <oliver at apple.com>
 
+        Fix Qt/ARM
+
+        C++ overload resolution I stab at thee
+
+        * jit/JITInlineMethods.h:
+        (JSC::JIT::beginUninterruptedSequence):
+        (JSC::JIT::endUninterruptedSequence):
+
+2010-08-09  Oliver Hunt  <oliver at apple.com>
+
         Reviewed by Gavin Barraclough.
 
         Allow an assembler/macroassembler to compact branches to more concise forms when linking
diff --git a/JavaScriptCore/jit/JITInlineMethods.h b/JavaScriptCore/jit/JITInlineMethods.h
index 3b28f34..e2e77db 100644
--- a/JavaScriptCore/jit/JITInlineMethods.h
+++ b/JavaScriptCore/jit/JITInlineMethods.h
@@ -99,6 +99,7 @@ ALWAYS_INLINE JIT::Call JIT::emitNakedCall(CodePtr function)
 
 ALWAYS_INLINE void JIT::beginUninterruptedSequence(int insnSpace, int constSpace)
 {
+    JSInterfaceJIT::beginUninterruptedSequence();
 #if CPU(ARM_TRADITIONAL)
 #ifndef NDEBUG
     // Ensure the label after the sequence can also fit
@@ -124,6 +125,7 @@ ALWAYS_INLINE void JIT::endUninterruptedSequence(int insnSpace, int constSpace)
     ASSERT(differenceBetween(m_uninterruptedInstructionSequenceBegin, label()) == insnSpace);
     ASSERT(sizeOfConstantPool() - m_uninterruptedConstantSequenceBegin == constSpace);
 #endif
+    JSInterfaceJIT::endUninterruptedSequence();
 }
 
 #endif

-- 
WebKit Debian packaging