Changeset 153209 in webkit for trunk/Source/JavaScriptCore/bytecode/CodeOrigin.h

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/bytecode/CodeOrigin.h (modified) (1 diff)

trunk/Source/JavaScriptCore/bytecode/CodeOrigin.h

@@ -89 +89 @@
     
     void dump(PrintStream&) const;
+
+    static inline bool isHandle(uint32_t bits) { return !!(bits & handleFlag); }
+    static inline uint32_t encodeHandle(uint32_t bits)
+    {
+        ASSERT(!isHandle(bits));
+        return bits | handleFlag;
+    }
+    static inline uint32_t decodeHandle(uint32_t bits)
+    {
+        ASSERT(isHandle(bits));
+        return bits & ~handleFlag;
+    }
+
+private:
+    static const uint32_t handleFlag = (1 << 31);
 };