Title: [127179] trunk/Source/_javascript_Core
Revision
127179
Author
[email protected]
Date
2012-08-30 13:17:51 -0700 (Thu, 30 Aug 2012)

Log Message

Fix broken classic intrpreter build.
https://bugs.webkit.org/show_bug.cgi?id=95484.

Patch by Mark Lam <[email protected]> on 2012-08-30
Reviewed by Filip Pizlo.

* interpreter/Interpreter.cpp:
(JSC::Interpreter::privateExecute):

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (127178 => 127179)


--- trunk/Source/_javascript_Core/ChangeLog	2012-08-30 20:14:58 UTC (rev 127178)
+++ trunk/Source/_javascript_Core/ChangeLog	2012-08-30 20:17:51 UTC (rev 127179)
@@ -1,3 +1,13 @@
+2012-08-30  Mark Lam  <[email protected]>
+
+        Fix broken classic intrpreter build.
+        https://bugs.webkit.org/show_bug.cgi?id=95484.
+
+        Reviewed by Filip Pizlo.
+
+        * interpreter/Interpreter.cpp:
+        (JSC::Interpreter::privateExecute):
+
 2012-08-30  Byungwoo Lee  <[email protected]>
 
         Build warning : -Wsign-compare on DFGByteCodeParser.cpp.

Modified: trunk/Source/_javascript_Core/interpreter/Interpreter.cpp (127178 => 127179)


--- trunk/Source/_javascript_Core/interpreter/Interpreter.cpp	2012-08-30 20:14:58 UTC (rev 127178)
+++ trunk/Source/_javascript_Core/interpreter/Interpreter.cpp	2012-08-30 20:17:51 UTC (rev 127179)
@@ -49,6 +49,7 @@
 #include "JSNotAnObject.h"
 #include "JSPropertyNameIterator.h"
 #include "JSString.h"
+#include "JSWithScope.h"
 #include "LiteralParser.h"
 #include "NameInstance.h"
 #include "ObjectPrototype.h"
@@ -2705,7 +2706,7 @@
             ++iter;
             ASSERT_UNUSED(end, iter != end);
         }
-        ASSERT((*iter)->isVariableObject());
+        ASSERT(iter->isVariableObject());
         JSVariableObject* scope = jsCast<JSVariableObject*>(iter.get());
         callFrame->uncheckedR(dst) = scope->registerAt(index).get();
         ASSERT(callFrame->r(dst).jsValue());
@@ -2736,7 +2737,7 @@
             ASSERT_UNUSED(end, iter != end);
         }
 
-        ASSERT((*iter)->isVariableObject());
+        ASSERT(iter->isVariableObject());
         JSVariableObject* scope = jsCast<JSVariableObject*>(iter.get());
         ASSERT(callFrame->r(value).jsValue());
         scope->registerAt(index).set(*globalData, scope, callFrame->r(value).jsValue());
@@ -4795,7 +4796,7 @@
         CHECK_FOR_EXCEPTION();
 
         callFrame->uncheckedR(scope) = JSValue(o);
-        callFrame->setScopeChain(callFrame->scopeChain()->push(JSWithScope(callFrame, o)));
+        callFrame->setScopeChain(callFrame->scopeChain()->push(JSWithScope::create(callFrame, o)));
 
         vPC += OPCODE_LENGTH(op_push_scope);
         NEXT_INSTRUCTION();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to