Changeset 153209 in webkit for trunk/Source/JavaScriptCore/interpreter/CallFrame.cpp

Timestamp:

Jul 24, 2013, 9:02:03 PM (12 years ago)

Author:

[email protected]

Message:

fourthTier: Disambiguate between CallFrame bytecodeOffset and codeOriginIndex.
​https://bugs.webkit.org/show_bug.cgi?id=117262.

Reviewed by Geoffrey Garen.

When writing to the ArgumentCount tag in CallFrame, we will set the high
bit if the written value is a codeOriginIndex.

• GNUmakefile.list.am:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
• JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
• JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
• JavaScriptCore.xcodeproj/project.pbxproj:
• bytecode/CodeOrigin.h:

(CodeOrigin):
(JSC::CodeOrigin::isHandle):
(JSC::CodeOrigin::encodeHandle):
(JSC::CodeOrigin::decodeHandle):

• dfg/DFGJITCompiler.h:

(JSC::DFG::JITCompiler::beginCall):

• dfg/DFGRepatch.cpp:

(JSC::DFG::tryBuildGetByIDList):

• interpreter/CallFrame.cpp:

(JSC::CallFrame::locationAsBytecodeOffset):
(JSC::CallFrame::setLocationAsBytecodeOffset):
(JSC::CallFrame::currentVPC):
(JSC::CallFrame::setCurrentVPC):
(JSC::CallFrame::trueCallFrame):

• interpreter/CallFrame.h:

(ExecState):
(JSC::ExecState::inlineCallFrame):

• interpreter/CallFrameInlines.h: Added.

(JSC::CallFrame::hasLocationAsBytecodeOffset):
(JSC::CallFrame::hasLocationAsCodeOriginIndex):
(JSC::CallFrame::locationAsRawBits):
(JSC::CallFrame::setLocationAsRawBits):
(JSC::CallFrame::locationAsBytecodeOffset):
(JSC::CallFrame::setLocationAsBytecodeOffset):
(JSC::CallFrame::locationAsCodeOriginIndex):

• interpreter/Interpreter.cpp:

(JSC::getBytecodeOffsetForCallFrame):
(JSC::getCallerInfo):

• jit/JITStubs.cpp:

(JSC::DEFINE_STUB_FUNCTION):

File:

• trunk/Source/JavaScriptCore/interpreter/CallFrame.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/interpreter/CallFrame.cpp

@@ -27 +27 @@
 #include "CallFrame.h"
 
+#include "CallFrameInlines.h"
 #include "CodeBlock.h"
 #include "Interpreter.h"
@@ -42 +43 @@
 
 #if USE(JSVALUE32_64)
-unsigned CallFrame::bytecodeOffsetForNonDFGCode() const
+unsigned CallFrame::locationAsBytecodeOffset() const
 {
     ASSERT(codeBlock());
+    ASSERT(hasLocationAsBytecodeOffset());
     return currentVPC() - codeBlock()->instructions().begin();
 }
 
-void CallFrame::setBytecodeOffsetForNonDFGCode(unsigned offset)
+void CallFrame::setLocationAsBytecodeOffset(unsigned offset)
 {
     ASSERT(codeBlock());
+    ASSERT(!CodeOrigin::isHandle(offset));
     setCurrentVPC(codeBlock()->instructions().begin() + offset);
+    ASSERT(hasLocationAsBytecodeOffset());
 }
 #else
 Instruction* CallFrame::currentVPC() const
 {
-    return codeBlock()->instructions().begin() + bytecodeOffsetForNonDFGCode();
+    return codeBlock()->instructions().begin() + locationAsBytecodeOffset();
 }
 void CallFrame::setCurrentVPC(Instruction* vpc)
 {
-    setBytecodeOffsetForNonDFGCode(vpc - codeBlock()->instructions().begin());
+    setLocationAsBytecodeOffset(vpc - codeBlock()->instructions().begin());
 }
 #endif
@@ -120 +124 @@
         }
     } else {
-        unsigned index = codeOriginIndexForDFG();
+        unsigned index = locationAsCodeOriginIndex();
         ASSERT(machineCodeBlock->canGetCodeOrigin(index));
         if (!machineCodeBlock->canGetCodeOrigin(index)) {