Changeset 127010 in webkit for trunk/Source/JavaScriptCore/runtime/JSGlobalData.cpp

Timestamp:

Aug 29, 2012, 10:13:50 AM (13 years ago)

Author:

[email protected]

Message:

Introduced JSWithScope, making all scope objects subclasses of JSScope
​https://bugs.webkit.org/show_bug.cgi?id=95295

Reviewed by Filip Pizlo.

This is a step toward removing ScopeChainNode. With a uniform representation
for objects in the scope chain, we can move data from ScopeChainNode
into JSScope.

• CMakeLists.txt:
• GNUmakefile.list.am:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
• JavaScriptCore.xcodeproj/project.pbxproj:
• Target.pri: Build!

• interpreter/Interpreter.cpp:

(JSC::Interpreter::privateExecute):

• jit/JITStubs.cpp:

(JSC::DEFINE_STUB_FUNCTION):

• llint/LLIntSlowPaths.cpp:

(JSC::LLInt::LLINT_SLOW_PATH_DECL): Use an explicit JSWithScope object
for 'with' statements. Since 'with' can put any object in the scope
chain, we'll need an adapter object to hold the data ScopeChainNode
currently holds.

• runtime/JSGlobalData.cpp:

(JSC::JSGlobalData::JSGlobalData):

• runtime/JSGlobalData.h:

(JSGlobalData): Support for JSWithScope.

• runtime/JSScope.cpp:

(JSC::JSScope::objectAtScope):

• runtime/JSScope.h: Check for and unwrap JSWithScope.

• runtime/JSType.h: Support for JSWithScope.

• runtime/StrictEvalActivation.cpp:

(JSC::StrictEvalActivation::StrictEvalActivation):

• runtime/StrictEvalActivation.h:

(StrictEvalActivation): Inherit from JSScope, to make the scope chain uniform.

• runtime/JSWithScope.cpp: Added.

(JSC::JSWithScope::visitChildren):

• runtime/JSWithScope.h: Added.

(JSWithScope):
(JSC::JSWithScope::create):
(JSC::JSWithScope::object):
(JSC::JSWithScope::createStructure):
(JSC::JSWithScope::JSWithScope): New adapter object. Since this object
is never exposed to scripts, it doesn't need any meaningful implementation
of property access or other callbacks.

File:

• trunk/Source/JavaScriptCore/runtime/JSGlobalData.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/runtime/JSGlobalData.cpp

@@ -49 +49 @@
 #include "JSNotAnObject.h"
 #include "JSPropertyNameIterator.h"
+#include "JSWithScope.h"
 #include "Lexer.h"
 #include "Lookup.h"
@@ -206 +207 @@
     sharedSymbolTableStructure.set(*this, SharedSymbolTable::createStructure(*this, 0, jsNull()));
     structureChainStructure.set(*this, StructureChain::createStructure(*this, 0, jsNull()));
+    withScopeStructure.set(*this, JSWithScope::createStructure(*this, 0, jsNull()));
 
     wtfThreadData().setCurrentIdentifierTable(existingEntryIdentifierTable);