Changeset 50608 in webkit for trunk/JavaScriptCore/interpreter

Timestamp:

Nov 6, 2009, 3:33:17 PM (16 years ago)

Author:

[email protected]

Message:

Rolled back in r50590 with Windows build hopefully fixed.

Location:

trunk/JavaScriptCore/interpreter

Files:

• CachedCall.h (modified) (1 diff)
• Interpreter.cpp (modified) (2 diffs)

trunk/JavaScriptCore/interpreter/CachedCall.h

@@ -39 +39 @@
             , m_interpreter(callFrame->interpreter())
             , m_exception(exception)
-            , m_globalObjectScope(callFrame, callFrame->globalData().dynamicGlobalObject ? callFrame->globalData().dynamicGlobalObject : function->scope().globalObject())
+            , m_globalObjectScope(callFrame, function->scope().globalObject())
         {
             ASSERT(!function->isHostFunction());

trunk/JavaScriptCore/interpreter/Interpreter.cpp

@@ -648 +648 @@
     }
 
-    DynamicGlobalObjectScope globalObjectScope(callFrame, callFrame->globalData().dynamicGlobalObject ? callFrame->globalData().dynamicGlobalObject : scopeChain->globalObject);
+    DynamicGlobalObjectScope globalObjectScope(callFrame, scopeChain->globalObject);
 
     CallFrame* newCallFrame = CallFrame::create(oldEnd);
@@ -778 +778 @@
     }
 
-    DynamicGlobalObjectScope globalObjectScope(callFrame, callFrame->globalData().dynamicGlobalObject ? callFrame->globalData().dynamicGlobalObject : scopeChain->globalObject);
+    DynamicGlobalObjectScope globalObjectScope(callFrame, scopeChain->globalObject);
 
     EvalCodeBlock* codeBlock = &eval->bytecode(callFrame, scopeChain);