Changeset 176700 in webkit

Timestamp:

Dec 2, 2014, 4:49:19 PM (12 years ago)

Author:

msaboff@apple.com

Message:

Change CallFrame::globalThisValue() to not use CallFrame::scope()
​https://bugs.webkit.org/show_bug.cgi?id=139202

Reviewed by Mark Lam.

Changed to use the globalThis() on the globalObject associated with the
callee. Moved the inline definition to JSGlobalObject.h instead of
including JSGlobalObject.h in JSScope.h. Also moved it as JSScope
objects are no longer involved in getting the value.

• runtime/JSGlobalObject.h:

(JSC::ExecState::globalThisValue):

• runtime/JSScope.h:

(JSC::ExecState::globalThisValue): Deleted.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/JSGlobalObject.h (modified) (1 diff)
• runtime/JSScope.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-12-02  Michael Saboff  <msaboff@apple.com>
+
+        Change CallFrame::globalThisValue() to not use CallFrame::scope()
+        https://bugs.webkit.org/show_bug.cgi?id=139202
+
+        Reviewed by Mark Lam.
+
+        Changed to use the globalThis() on the globalObject associated with the
+        callee.  Moved the inline definition to JSGlobalObject.h instead of
+        including JSGlobalObject.h in JSScope.h.  Also moved it as JSScope
+        objects are no longer involved in getting the value.
+
+        * runtime/JSGlobalObject.h:
+        (JSC::ExecState::globalThisValue):
+        * runtime/JSScope.h:
+        (JSC::ExecState::globalThisValue): Deleted.
+
 2014-12-02  Matthew Mirman  <mmirman@apple.com>
 

trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h

@@ -675 +675 @@
 }
 
+inline JSObject* ExecState::globalThisValue() const
+{
+    return lexicalGlobalObject()->globalThis();
+}
+
 inline JSObject* JSScope::globalThis()
 { 

trunk/Source/JavaScriptCore/runtime/JSScope.h

@@ -245 +245 @@
 }
 
-inline JSObject* ExecState::globalThisValue() const
-{
-    return scope()->globalThis();
-}
-
 inline size_t JSScope::offsetOfNext()
 {