Changeset 34673 in webkit for trunk/JavaScriptCore

Timestamp:

Jun 19, 2008, 3:23:11 PM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Darin.

Get rid of some threadInstance calls.

• kjs/JSGlobalObject.cpp: (KJS::JSGlobalObject::init):
• kjs/Parser.cpp: (KJS::Parser::parse):
• kjs/Shell.cpp: (jscmain):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/JSGlobalObject.cpp (modified) (1 diff)
• kjs/Parser.cpp (modified) (2 diffs)
• kjs/Shell.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-06-19  Alexey Proskuryakov  <[email protected]>
+
+        Reviewed by Darin.
+
+        Get rid of some threadInstance calls.
+
+        * kjs/JSGlobalObject.cpp:
+        (KJS::JSGlobalObject::init):
+        * kjs/Parser.cpp:
+        (KJS::Parser::parse):
+        * kjs/Shell.cpp:
+        (jscmain):
+
 2008-06-19  Alexey Proskuryakov  <[email protected]>
 

trunk/JavaScriptCore/kjs/JSGlobalObject.cpp

@@ -129 +129 @@
     d()->debugger = 0;
     
-    d()->globalData = &JSGlobalData::threadInstance();
+    d()->globalData = (Heap::heap(this) == JSGlobalData::sharedInstance().heap) ? &JSGlobalData::sharedInstance() : &JSGlobalData::threadInstance();
 
     d()->globalExec.set(new ExecState(this, thisValue, d()->globalScopeChain.node()));

trunk/JavaScriptCore/kjs/Parser.cpp

@@ -62 +62 @@
     *errMsg = 0;
         
-    Lexer& lexer = *JSGlobalData::threadInstance().lexer;
+    Lexer& lexer = *exec->lexer();
 
     if (startingLineNumber <= 0)
@@ -70 +70 @@
     *sourceId = ++m_sourceId;
 
-    int parseError = kjsyyparse(&JSGlobalData::threadInstance());
+    int parseError = kjsyyparse(&exec->globalData());
     bool lexError = lexer.sawError();
     lexer.clear();

trunk/JavaScriptCore/kjs/Shell.cpp

@@ -453 +453 @@
 
 #ifndef NDEBUG
-    JSGlobalData::threadInstance().heap->collect();
+    globalObject->globalData()->heap->collect();
 #endif