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

Timestamp:

Jun 2, 2008, 9:32:15 AM (17 years ago)

Author:

[email protected]

Message:

2008-06-02 Geoffrey Garen <​[email protected]>

Reviewed by Alice Liu.

Refactored some hand-rolled code to call ScopeChain::globalObject instead.

File:

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

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -5845 +5845 @@
 {
     ScopeChain scopeChain(sc);
-    JSGlobalObject* globalObject = static_cast<JSGlobalObject*>(scopeChain.bottom());
-    ASSERT(globalObject->isGlobalObject());
-    
+    JSGlobalObject* globalObject = scopeChain.globalObject();
+
+    SymbolTable symbolTable;
+
     m_code.set(new EvalCodeBlock(this, globalObject));
-    SymbolTable symbolTable;
+
     CodeGenerator generator(this, globalObject->debugger(), scopeChain, &symbolTable, m_code.get(), m_varStack, m_functionStack);
     generator.generate();
@@ -5885 +5886 @@
 void FunctionBodyNode::generateCode(ScopeChainNode* sc)
 {
+    ScopeChain scopeChain(sc);
+    JSGlobalObject* globalObject = scopeChain.globalObject();
+
     m_code.set(new CodeBlock(this));
-
-    ScopeChain scopeChain(sc);
-    JSGlobalObject* globalObject = static_cast<JSGlobalObject*>(scopeChain.bottom());
-    ASSERT(globalObject->isGlobalObject());
 
     CodeGenerator generator(this, globalObject->debugger(), scopeChain, &m_symbolTable, m_code.get(), m_varStack, m_functionStack, m_parameters);
@@ -5925 +5925 @@
 {
     ScopeChain scopeChain(sc);
-    JSGlobalObject* globalObject = static_cast<JSGlobalObject*>(scopeChain.bottom());
-    ASSERT(globalObject->isGlobalObject());
+    JSGlobalObject* globalObject = scopeChain.globalObject();
     
     m_code.set(new ProgramCodeBlock(this, globalObject));