Changeset 27885 in webkit for trunk/JavaScriptCore/kjs/ExecState.cpp

Timestamp:

Nov 18, 2007, 1:09:27 AM (18 years ago)

Author:

[email protected]

Message:

Fix: <rdar://problem/5607032> (REGRESSION: testapi exits with assertion failure in debug build) and <rdar://problem/5440659> (JSGlobalContextCreate throws away globalObjectClass's prototype)

Split Interpreter's initialization into two distinct steps: the creation of the global prototypes
and constructors, and storing them on the global object. This allows JSClassRef's passed to
JSGlobalContextCreate to be instantiated with the correct prototype.

Reviewed by Darin Adler.

File:

• trunk/JavaScriptCore/kjs/ExecState.cpp (modified) (5 diffs)

trunk/JavaScriptCore/kjs/ExecState.cpp

@@ -34 +34 @@
 
 // ECMA 10.2
-ExecState::ExecState(Interpreter* interpreter, JSGlobalObject* glob, JSObject* thisV, 
+ExecState::ExecState(Interpreter* interpreter, JSGlobalObject* globalObject, JSObject* thisV, 
                      FunctionBodyNode* currentBody, CodeType type, ExecState* callingExec, 
                      FunctionImp* func, const List* args)
@@ -56 +56 @@
     } else {
         m_activation = 0;
-        m_variable = glob;
+        m_variable = globalObject;
     }
     
@@ -63 +63 @@
     case EvalCode:
         if (m_callingExecState) {
-            scope = m_callingExecState->scopeChain();
+            m_scopeChain = m_callingExecState->scopeChain();
             m_variable = m_callingExecState->variableObject();
             m_thisVal = m_callingExecState->thisValue();
@@ -69 +69 @@
         } // else same as GlobalCode
     case GlobalCode:
-        scope.clear();
-        scope.push(glob);
-        m_thisVal = static_cast<JSObject*>(glob);
+        if (globalObject)
+            setGlobalObject(globalObject);
         break;
     case FunctionCode:
-        scope = func->scope();
-        scope.push(m_activation);
+        m_scopeChain = func->scope();
+        m_scopeChain.push(m_activation);
         m_variable = m_activation; // TODO: DontDelete ? (ECMA 10.2.3)
         m_thisVal = thisV;
@@ -93 +92 @@
 {
     for (ExecState* exec = this; exec; exec = exec->m_callingExecState)
-        exec->scope.mark();
+        exec->m_scopeChain.mark();
+}
+
+void ExecState::setGlobalObject(JSGlobalObject* globalObject)
+{
+    m_scopeChain.clear();
+    m_scopeChain.push(globalObject);
+    m_thisVal = static_cast<JSObject*>(globalObject);
 }