Changeset 34457 in webkit for trunk/JavaScriptCore

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:

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• VM/CodeBlock.h (modified) (5 diffs)
• VM/Machine.cpp (modified) (1 diff)
• kjs/nodes.cpp (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+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.
+
+        * 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):
+
 2008-06-07  Cameron Zwarich  <[email protected]>
 

trunk/JavaScriptCore/VM/CodeBlock.h

@@ -57 +57 @@
 
     struct CodeBlock {
-        CodeBlock(ScopeNode* ownerNode_)
+        CodeBlock(ScopeNode* ownerNode_, CodeType codeType_)
             : ownerNode(ownerNode_)
             , numTemporaries(0)
@@ -65 +65 @@
             , needsFullScopeChain(ownerNode_->usesEval() || ownerNode_->needsClosure())
             , usesEval(ownerNode_->usesEval())
+            , codeType(codeType_)
         {
         }
@@ -82 +83 @@
         bool needsFullScopeChain;
         bool usesEval;
+        CodeType codeType;
 
         Vector<Instruction> instructions;
@@ -102 +104 @@
 
     struct ProgramCodeBlock : public CodeBlock {
-        ProgramCodeBlock(ScopeNode* ownerNode, JSGlobalObject* globalObject_)
-            : CodeBlock(ownerNode)
+        ProgramCodeBlock(ScopeNode* ownerNode_, CodeType codeType_, JSGlobalObject* globalObject_)
+            : CodeBlock(ownerNode_, codeType_)
             , globalObject(globalObject_)
         {
@@ -119 +121 @@
 
     struct EvalCodeBlock : public ProgramCodeBlock {
-        EvalCodeBlock(ScopeNode* ownerNode, JSGlobalObject* globalObject_)
-            : ProgramCodeBlock(ownerNode, globalObject_)
+        EvalCodeBlock(ScopeNode* ownerNode_, JSGlobalObject* globalObject_)
+            : ProgramCodeBlock(ownerNode_, EvalCode, globalObject_)
         {
         }

trunk/JavaScriptCore/VM/Machine.cpp

@@ -65 +65 @@
     if (!callerCodeBlock) // test for top frame of re-entrant function call
         return false;
-
+    
+    if (callerCodeBlock->codeType == EvalCode)
+        return false;
+    
     callerOffset = callFrame[Machine::CallerRegisterOffset].u.i - callerCodeBlock->numLocals - Machine::CallFrameHeaderSize;
     if (callerOffset < 0) // test for global frame
-        return false;
-
-    Register* callerCallFrame = (*registerBase) + callerOffset;
-    if (!callerCallFrame[Machine::CallerCodeBlock].u.codeBlock) // test for eval frame
         return false;
 

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);