Changeset 39752 in webkit for trunk/JavaScriptCore/parser

Timestamp:

Jan 9, 2009, 10:47:37 AM (16 years ago)

Author:

[email protected]

Message:

2009-01-09 Sam Weinig <​[email protected]>

Roll r39720 back in with a working interpreted mode.

Location:

trunk/JavaScriptCore/parser

Files:

• Nodes.cpp (modified) (5 diffs)
• Nodes.h (modified) (2 diffs)

trunk/JavaScriptCore/parser/Nodes.cpp

@@ -2506 +2506 @@
     JSGlobalObject* globalObject = scopeChain.globalObject();
 
-    m_code.set(new EvalCodeBlock(this, globalObject, source().provider()));
+    m_code.set(new EvalCodeBlock(this, globalObject, source().provider(), scopeChain.localDepth()));
 
     BytecodeGenerator generator(this, globalObject->debugger(), scopeChain, &m_code->symbolTable(), m_code.get());
@@ -2516 +2516 @@
 }
 
-EvalCodeBlock& EvalNode::bytecodeForExceptionInfoReparse(ScopeChainNode* scopeChainNode)
+EvalCodeBlock& EvalNode::bytecodeForExceptionInfoReparse(ScopeChainNode* scopeChainNode, CodeBlock* codeBlockBeingRegeneratedFrom)
 {
     ASSERT(!m_code);
@@ -2523 +2523 @@
     JSGlobalObject* globalObject = scopeChain.globalObject();
 
-    m_code.set(new EvalCodeBlock(this, globalObject, source().provider()));
+    m_code.set(new EvalCodeBlock(this, globalObject, source().provider(), scopeChain.localDepth()));
 
     BytecodeGenerator generator(this, globalObject->debugger(), scopeChain, &m_code->symbolTable(), m_code.get());
-    generator.setRegeneratingForExceptionInfo();
+    generator.setRegeneratingForExceptionInfo(codeBlockBeingRegeneratedFrom);
     generator.generate();
 
@@ -2609 +2609 @@
 }
 
-CodeBlock& FunctionBodyNode::bytecodeForExceptionInfoReparse(ScopeChainNode* scopeChainNode)
+CodeBlock& FunctionBodyNode::bytecodeForExceptionInfoReparse(ScopeChainNode* scopeChainNode, CodeBlock* codeBlockBeingRegeneratedFrom)
 {
     ASSERT(!m_code);
@@ -2619 +2619 @@
 
     BytecodeGenerator generator(this, globalObject->debugger(), scopeChain, &m_code->symbolTable(), m_code.get());
-    generator.setRegeneratingForExceptionInfo();
+    generator.setRegeneratingForExceptionInfo(codeBlockBeingRegeneratedFrom);
     generator.generate();
 

trunk/JavaScriptCore/parser/Nodes.h

@@ -2157 +2157 @@
         }
 
-        EvalCodeBlock& bytecodeForExceptionInfoReparse(ScopeChainNode*) JSC_FAST_CALL;
+        EvalCodeBlock& bytecodeForExceptionInfoReparse(ScopeChainNode*, CodeBlock*) JSC_FAST_CALL;
 
     private:
@@ -2222 +2222 @@
         }
 
-        CodeBlock& bytecodeForExceptionInfoReparse(ScopeChainNode* scopeChain) JSC_FAST_CALL;
+        CodeBlock& bytecodeForExceptionInfoReparse(ScopeChainNode*, CodeBlock*) JSC_FAST_CALL;
 
     private: