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

Timestamp:

Jan 18, 2011, 3:45:34 PM (14 years ago)

Author:

[email protected]

Message:

2011-01-18 Geoffrey Garen <​[email protected]>

Reviewed by Darin Adler.

Removed RegisterFile::markGlobals because it was obtuse, and it
unnecessarily relied on conservative marking.
​https://bugs.webkit.org/show_bug.cgi?id=52668

• interpreter/RegisterFile.h: Removed markGlobals.

• runtime/JSActivation.cpp: (JSC::JSActivation::markChildren): Added a comment explaning why some JSActivations don't always mark their registers arrays.

• runtime/JSGlobalObject.cpp: (JSC::JSGlobalObject::markChildren): Instead of calling markGlobals, mark the registers array directly.

File:

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

trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp

@@ -350 +350 @@
         (*it)->markAggregate(markStack);
 
-    RegisterFile& registerFile = globalData().interpreter->registerFile();
-    if (registerFile.globalObject() == this)
-        registerFile.markGlobals(markStack, &globalData().heap);
-
     markIfNeeded(markStack, d()->regExpConstructor);
     markIfNeeded(markStack, d()->errorConstructor);
@@ -398 +394 @@
     // guaranteed to be referenced elsewhere.
 
-    Register* registerArray = d()->registerArray.get();
-    if (!registerArray)
-        return;
-
-    size_t size = d()->registerArraySize;
-    markStack.appendValues(reinterpret_cast<JSValue*>(registerArray), size);
+    markStack.appendValues(d()->registers - symbolTable().size(), symbolTable().size());
 }