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

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.h (modified) (4 diffs)

trunk/JavaScriptCore/kjs/ExecState.h

@@ -72 +72 @@
         bool hadException() const { return !!m_exception; }
         
-        const ScopeChain& scopeChain() const { return scope; }
+        const ScopeChain& scopeChain() const { return m_scopeChain; }
         
         JSObject* variableObject() const { return m_variable; }
@@ -87 +87 @@
         const List* arguments() const { return m_arguments; }
         
-        void pushScope(JSObject* s) { scope.push(s); }
-        void popScope() { scope.pop(); }
+        void pushScope(JSObject* s) { m_scopeChain.push(s); }
+        void popScope() { m_scopeChain.pop(); }
         LabelStack* seenLabels() { return &ls; }
         
@@ -98 +98 @@
         void popSwitch() { m_switchDepth--; }
         bool inSwitch() const { return (m_switchDepth > 0); }
+
+        void setGlobalObject(JSGlobalObject*);
         
         void mark();
@@ -130 +132 @@
         LocalStorageEntry* m_localStorageBuffer;
 
-        ScopeChain scope;
+        ScopeChain m_scopeChain;
         JSObject* m_variable;
         JSObject* m_thisVal;