[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 12:27:11 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 54a2716ae728a2a489be251996cf5582a596c88c
Author: oliver at apple.com <oliver at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 24 00:04:01 2010 +0000

    2010-08-23  Oliver Hunt  <oliver at apple.com>
    
            Reviewed by Darin Adler.
    
            [REGRESSION] Interpreter incorrectly excludes prototype chain when validating put_by_id_transition
            https://bugs.webkit.org/show_bug.cgi?id=44240
            <rdar://problem/8328995>
    
            Fix an error I introduced when cleaning up the interpreter side of the logic
            to prevent setters being called in object initialisers.
    
            * interpreter/Interpreter.cpp:
            (JSC::Interpreter::privateExecute):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65847 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 80e9dac..8f38b29 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-08-23  Oliver Hunt  <oliver at apple.com>
+
+        Reviewed by Darin Adler.
+
+        [REGRESSION] Interpreter incorrectly excludes prototype chain when validating put_by_id_transition
+        https://bugs.webkit.org/show_bug.cgi?id=44240
+        <rdar://problem/8328995>
+
+        Fix an error I introduced when cleaning up the interpreter side of the logic
+        to prevent setters being called in object initialisers.
+
+        * interpreter/Interpreter.cpp:
+        (JSC::Interpreter::privateExecute):
+
 2010-08-23  Michael Saboff  <msaboff at apple.com>
 
         Reviewed by Oliver Hunt.
diff --git a/JavaScriptCore/interpreter/Interpreter.cpp b/JavaScriptCore/interpreter/Interpreter.cpp
index b1049ad..d43eb57 100644
--- a/JavaScriptCore/interpreter/Interpreter.cpp
+++ b/JavaScriptCore/interpreter/Interpreter.cpp
@@ -2952,7 +2952,7 @@ skip_id_custom_self:
                 JSObject* baseObject = asObject(baseCell);
                 int direct = vPC[8].u.operand;
                 
-                if (direct) {
+                if (!direct) {
                     RefPtr<Structure>* it = vPC[6].u.structureChain->head();
 
                     JSValue proto = baseObject->structure()->prototypeForLookup(callFrame);

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list