Changeset 127363 in webkit for trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp

Timestamp:

Sep 1, 2012, 12:45:01 AM (13 years ago)

Author:

[email protected]

Message:

2012-09-01 Geoffrey Garen <​[email protected]>

Rolled back in a piece of <​http://trac.webkit.org/changeset/127293>.

Shrink activation objects by half
​https://bugs.webkit.org/show_bug.cgi?id=95591

Reviewed by Sam Weinig.

• runtime/JSActivation.cpp: (JSC::JSActivation::JSActivation):
• runtime/JSGlobalObject.cpp: (JSC::JSGlobalObject::JSGlobalObject): (JSC::JSGlobalObject::setGlobalThis): (JSC): (JSC::JSGlobalObject::visitChildren):
• runtime/JSGlobalObject.h: (JSGlobalObject): (JSC::JSScope::globalThis): (JSC): (JSC::JSGlobalObject::globalThis):
• runtime/JSNameScope.h: (JSC::JSNameScope::JSNameScope):
• runtime/JSScope.cpp: (JSC::JSScope::visitChildren):
• runtime/JSScope.h: (JSScope): (JSC::JSScope::JSScope): (JSC::JSScope::globalObject): (JSC::JSScope::globalData):
• runtime/JSSegmentedVariableObject.h: (JSC::JSSegmentedVariableObject::JSSegmentedVariableObject):
• runtime/JSSymbolTableObject.h: (JSC::JSSymbolTableObject::JSSymbolTableObject):
• runtime/JSVariableObject.h: (JSC::JSVariableObject::JSVariableObject):
• runtime/JSWithScope.h: (JSC::JSWithScope::JSWithScope):
• runtime/StrictEvalActivation.cpp: (JSC::StrictEvalActivation::StrictEvalActivation):

File:

• trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp

@@ -110 +110 @@
 
 JSGlobalObject::JSGlobalObject(JSGlobalData& globalData, Structure* structure, const GlobalObjectMethodTable* globalObjectMethodTable)
-    : Base(globalData, structure, this, this, 0)
+    : Base(globalData, structure, 0)
     , m_masqueradesAsUndefinedWatchpoint(adoptRef(new WatchpointSet(InitializedWatching)))
     , m_weakRandom(Options::forceWeakRandomSeed() ? Options::forcedWeakRandomSeed() : static_cast<unsigned>(randomNumber() * (std::numeric_limits<unsigned>::max() + 1.0)))
@@ -130 +130 @@
 {
     static_cast<JSGlobalObject*>(cell)->JSGlobalObject::~JSGlobalObject();
+}
+
+void JSGlobalObject::setGlobalThis(JSGlobalData& globalData, JSObject* globalThis)
+{ 
+    m_globalThis.set(globalData, this, globalThis);
 }
 
@@ -353 +358 @@
     Base::visitChildren(thisObject, visitor);
 
+    visitor.append(&thisObject->m_globalThis);
     visitor.append(&thisObject->m_methodCallDummy);