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

Timestamp:

Feb 1, 2011, 9:05:55 PM (14 years ago)

Author:

[email protected]

Message:

2011-02-01 Sheriff Bot <​[email protected]>

Unreviewed, rolling out r77297.
​http://trac.webkit.org/changeset/77297
​https://bugs.webkit.org/show_bug.cgi?id=53538

caused leopard crashes (Requested by paroga on #webkit).

• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
• wtf/text/AtomicString.cpp: (WTF::AtomicString::fromUTF8):
• wtf/unicode/UTF8.cpp: (WTF::Unicode::calculateStringHashFromUTF8):
• wtf/unicode/UTF8.h:

File:

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

trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp

@@ -105 +105 @@
     }
 
-    d()->next->d()->prev = d()->prev;
-    d()->prev->d()->next = d()->next;
-    JSGlobalObject*& headObject = head();
-    if (headObject == this)
-        headObject = d()->next;
-    if (headObject == this)
-        headObject = 0;
-
-    HashSet<GlobalCodeBlock*>::const_iterator end = codeBlocks().end();
-    for (HashSet<GlobalCodeBlock*>::const_iterator it = codeBlocks().begin(); it != end; ++it)
-        (*it)->clearGlobalObject();
-        
+    d()->globalData->globalObjects.take(this);
+
     RegisterFile& registerFile = globalData().interpreter->registerFile();
     if (registerFile.clearGlobalObject(this))
@@ -126 +116 @@
 {
     ASSERT(JSLock::currentThreadIsHoldingLock());
-
+    
     structure()->disableSpecificFunctionTracking();
 
     d()->globalData = Heap::heap(this)->globalData();
+    d()->globalData->globalObjects.set(this, this);
     d()->globalScopeChain = ScopeChain(this, d()->globalData.get(), this, thisValue);
 
     JSGlobalObject::globalExec()->init(0, 0, d()->globalScopeChain.node(), CallFrame::noCaller(), 0, 0);
-
-    if (JSGlobalObject*& headObject = head()) {
-        d()->prev = headObject;
-        d()->next = headObject->d()->next;
-        headObject->d()->next->d()->prev = this;
-        headObject->d()->next = this;
-    } else
-        headObject = d()->next = d()->prev = this;
 
     d()->debugger = 0;
@@ -346 +329 @@
     JSVariableObject::markChildren(markStack);
     
-    HashSet<GlobalCodeBlock*>::const_iterator end = codeBlocks().end();
-    for (HashSet<GlobalCodeBlock*>::const_iterator it = codeBlocks().begin(); it != end; ++it)
-        (*it)->markAggregate(markStack);
-
     markIfNeeded(markStack, &d()->regExpConstructor);
     markIfNeeded(markStack, &d()->errorConstructor);