Changeset 28468 in webkit for trunk/JavaScriptCore/kjs/nodes.cpp

Timestamp:

Dec 5, 2007, 6:31:41 PM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

Reviewed by Darin Adler.

Third step in refactoring JSGlobalObject: Moved data members and
functions accessing data members from Interpreter to JSGlobalObject.
Changed Interpreter member functions to static functions.

This resolves a bug in global object bootstrapping, where the global
ExecState could be used when uninitialized.

This is a big change, but it's mostly code motion and renaming.

Layout and JS tests, and testjsglue and testapi, pass. SunSpider reports
a .7% regression, but Shark sees no difference related to this patch,
and SunSpider reported a .7% speedup from an earlier step in this
refactoring, so I think it's fair to call that a wash.

JavaScriptGlue:

Reviewed by Darin Adler.

Third step in refactoring JSGlobalObject: Moved data members and data
member access from Interpreter to JSGlobalObject. Replaced JSInterpreter
subclass with JSGlobalObject subclass.

• JSRun.cpp: (JSRun::JSRun): (JSRun::Evaluate): (JSRun::CheckSyntax):
• JSRun.h: (JSGlueGlobalObject::JSGlueGlobalObject):
• JSUtils.cpp: (KJSValueToCFTypeInternal):
• JSValueWrapper.cpp: (getThreadGlobalExecState):

WebCore:

Reviewed by Darin Adler.

Third step in refactoring JSGlobalObject: Moved data members and data
member access from Interpreter to JSGlobalObject. Changed Interpreter
member functions to static functions. Same for the subclass,
ScriptInterpreter.

This is a big change, but it's mostly code motion and renaming.

WebKit/mac:

Reviewed by Darin Adler.

Third step in refactoring JSGlobalObject: Moved data members and data
member access from Interpreter to JSGlobalObject.

• WebView/WebFrame.mm: (-[WebFrame _attachScriptDebugger]):

WebKit/win:

Reviewed by Darin Adler.

Third step in refactoring JSGlobalObject: Moved data members and data
member access from Interpreter to JSGlobalObject.

• WebFrame.cpp: (WebFrame::globalContext): (WebFrame::attachScriptDebugger): (WebFrame::windowObjectCleared):
• WebScriptDebugger.cpp: (WebScriptDebugger::WebScriptDebugger):

File:

• trunk/JavaScriptCore/kjs/nodes.cpp (modified) (17 diffs)

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -360 +360 @@
         }
     }
-    Debugger* dbg = exec->dynamicInterpreter()->debugger();
+    Debugger* dbg = exec->dynamicGlobalObject()->debugger();
     if (dbg && !dbg->hasHandledException(exec, exceptionValue)) {
         bool cont = dbg->exception(exec, currentSourceId(exec), m_line, exceptionValue);
@@ -393 +393 @@
 bool StatementNode::hitStatement(ExecState* exec)
 {
-  Debugger *dbg = exec->dynamicInterpreter()->debugger();
+  Debugger *dbg = exec->dynamicGlobalObject()->debugger();
   if (dbg)
     return dbg->atStatement(exec, currentSourceId(exec), firstLine(), lastLine());
@@ -491 +491 @@
 JSValue* RegExpNode::evaluate(ExecState* exec)
 {
-    return exec->lexicalInterpreter()->builtinRegExp()->createRegExpImp(exec, m_regExp);
+    return exec->lexicalGlobalObject()->regExpConstructor()->createRegExpImp(exec, m_regExp);
 }
 
@@ -615 +615 @@
 JSValue *ElementNode::evaluate(ExecState *exec)
 {
-  JSObject *array = exec->lexicalInterpreter()->builtinArray()->construct(exec, List::empty());
+  JSObject *array = exec->lexicalGlobalObject()->arrayConstructor()->construct(exec, List::empty());
   int length = 0;
   for (ElementNode *n = this; n; n = n->next.get()) {
@@ -646 +646 @@
     length = opt ? array->get(exec, exec->propertyNames().length)->toInt32(exec) : 0;
   } else {
-    JSValue *newArr = exec->lexicalInterpreter()->builtinArray()->construct(exec,List::empty());
+    JSValue *newArr = exec->lexicalGlobalObject()->arrayConstructor()->construct(exec,List::empty());
     array = static_cast<JSObject*>(newArr);
     length = 0;
@@ -671 +671 @@
     return list->evaluate(exec);
 
-  return exec->lexicalInterpreter()->builtinObject()->construct(exec,List::empty());
+  return exec->lexicalGlobalObject()->objectConstructor()->construct(exec,List::empty());
 }
 
@@ -686 +686 @@
 JSValue *PropertyListNode::evaluate(ExecState *exec)
 {
-  JSObject *obj = exec->lexicalInterpreter()->builtinObject()->construct(exec, List::empty());
+  JSObject *obj = exec->lexicalGlobalObject()->objectConstructor()->construct(exec, List::empty());
   
   for (PropertyListNode *p = this; p; p = p->next.get()) {
@@ -946 +946 @@
   KJS_CHECKEXCEPTIONVALUE
 
-  JSObject *thisObj =  exec->dynamicInterpreter()->globalObject();
+  JSObject *thisObj =  exec->dynamicGlobalObject();
 
   return func->call(exec, thisObj, argList);
@@ -1001 +1001 @@
       // that in host objects you always get a valid object for this.
       if (thisObj->isActivation())
-        thisObj = exec->dynamicInterpreter()->globalObject();
+        thisObj = exec->dynamicGlobalObject();
 
       return func->call(exec, thisObj, argList);
@@ -1062 +1062 @@
     KJS_CHECKEXCEPTIONVALUE
 
-    return func->call(exec, exec->dynamicInterpreter()->globalObject(), argList);
+    return func->call(exec, exec->dynamicGlobalObject(), argList);
 }
 
@@ -3784 +3784 @@
         exec->popIteration();
 
-        if (exec->dynamicInterpreter()->timedOut())
+        if (exec->dynamicGlobalObject()->timedOut())
             return Completion(Interrupted);
 
@@ -3837 +3837 @@
         exec->popIteration();
 
-        if (exec->dynamicInterpreter()->timedOut())
+        if (exec->dynamicGlobalObject()->timedOut())
             return Completion(Interrupted);
     
@@ -3903 +3903 @@
         }
 
-        if (exec->dynamicInterpreter()->timedOut())
+        if (exec->dynamicGlobalObject()->timedOut())
             return Completion(Interrupted);
 
@@ -4581 +4581 @@
     processDeclarations(exec);
 
-    if (Debugger* dbg = exec->dynamicInterpreter()->debugger()) {
+    if (Debugger* dbg = exec->dynamicGlobalObject()->debugger()) {
         if (!dbg->callEvent(exec, sourceId(), lineNo(), exec->function(), *exec->arguments())) {
             dbg->imp()->abort();
@@ -4590 +4590 @@
     Completion completion = BlockNode::execute(exec);
     
-    if (Debugger* dbg = exec->dynamicInterpreter()->debugger()) {
+    if (Debugger* dbg = exec->dynamicGlobalObject()->debugger()) {
         if (completion.complType() == Throw)
             exec->setException(completion.value());
@@ -4621 +4621 @@
   FunctionImp *func = new FunctionImp(exec, ident, body.get(), exec->scopeChain());
 
-  JSObject *proto = exec->lexicalInterpreter()->builtinObject()->construct(exec, List::empty());
+  JSObject *proto = exec->lexicalGlobalObject()->objectConstructor()->construct(exec, List::empty());
   proto->put(exec, exec->propertyNames().constructor, func, ReadOnly | DontDelete | DontEnum);
   func->put(exec, exec->propertyNames().prototype, proto, Internal|DontDelete);
@@ -4657 +4657 @@
 
   FunctionImp* func = new FunctionImp(exec, ident, body.get(), exec->scopeChain());
-  JSObject* proto = exec->lexicalInterpreter()->builtinObject()->construct(exec, List::empty());
+  JSObject* proto = exec->lexicalGlobalObject()->objectConstructor()->construct(exec, List::empty());
   proto->put(exec, exec->propertyNames().constructor, func, ReadOnly | DontDelete | DontEnum);
   func->put(exec, exec->propertyNames().prototype, proto, Internal | DontDelete);