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

Timestamp:

Jun 8, 2008, 5:57:28 PM (17 years ago)

Author:

[email protected]

Message:

2008-06-08 Cameron Zwarich <​[email protected]>

Reviewed by Darin.

Bug 19346: REGRESSION: Mootools 1.2 Class inheritance broken in post-SquirrelFish merge
<​https://bugs.webkit.org/show_bug.cgi?id=19346>

A check for whether a function's caller is eval code accidentally included
the case where the caller's caller is native code. Add a CodeType field to
CodeBlock and use this for the eval caller test instead.

JavaScriptCore:

• VM/CodeBlock.h: (KJS::CodeBlock::CodeBlock): (KJS::ProgramCodeBlock::ProgramCodeBlock): (KJS::EvalCodeBlock::EvalCodeBlock):
• VM/Machine.cpp: (KJS::getCallerFunctionOffset):
• kjs/nodes.cpp: (KJS::FunctionBodyNode::generateCode): (KJS::ProgramNode::generateCode):

LayoutTests:

• fast/js/function-dot-arguments-and-caller-expected.txt:
• fast/js/function-dot-arguments-and-caller.html:

File:

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

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -1818 +1818 @@
     JSGlobalObject* globalObject = scopeChain.globalObject();
 
-    m_code.set(new CodeBlock(this));
+    m_code.set(new CodeBlock(this, FunctionCode));
 
     CodeGenerator generator(this, globalObject->debugger(), scopeChain, &m_symbolTable, m_code.get());
@@ -1854 +1854 @@
     JSGlobalObject* globalObject = scopeChain.globalObject();
     
-    m_code.set(new ProgramCodeBlock(this, globalObject));
+    m_code.set(new ProgramCodeBlock(this, GlobalCode, globalObject));
     
     CodeGenerator generator(this, globalObject->debugger(), scopeChain, &globalObject->symbolTable(), m_code.get(), m_varStack, m_functionStack, canCreateGlobals);