Changeset 158141 in webkit for trunk/Source/JavaScriptCore/bytecode/ExitKind.h

Timestamp:

Oct 28, 2013, 3:32:37 PM (12 years ago)

Author:

[email protected]

Message:

OSRExit::m_watchpointIndex should be in OSRExitCompilationInfo
​https://bugs.webkit.org/show_bug.cgi?id=123423

Reviewed by Mark Hahnenberg.

Also enable ExitKind to tell you if it's a watchpoint.

• bytecode/ExitKind.cpp:

(JSC::exitKindToString):

• bytecode/ExitKind.h:

(JSC::isWatchpoint):

• dfg/DFGByteCodeParser.cpp:

(JSC::DFG::ByteCodeParser::setLocal):
(JSC::DFG::ByteCodeParser::setArgument):
(JSC::DFG::ByteCodeParser::handleCall):
(JSC::DFG::ByteCodeParser::handleGetById):
(JSC::DFG::ByteCodeParser::parseBlock):

• dfg/DFGJITCompiler.cpp:

(JSC::DFG::JITCompiler::linkOSRExits):
(JSC::DFG::JITCompiler::link):

• dfg/DFGJITCompiler.h:

(JSC::DFG::JITCompiler::appendExitInfo):

• dfg/DFGOSRExit.cpp:

(JSC::DFG::OSRExit::OSRExit):

• dfg/DFGOSRExit.h:
• dfg/DFGOSRExitCompilationInfo.h:

(JSC::DFG::OSRExitCompilationInfo::OSRExitCompilationInfo):

• dfg/DFGOSRExitCompiler.cpp:
• dfg/DFGSpeculativeJIT.cpp:

(JSC::DFG::SpeculativeJIT::speculationWatchpoint):

• dfg/DFGSpeculativeJIT32_64.cpp:

(JSC::DFG::SpeculativeJIT::compile):

• dfg/DFGSpeculativeJIT64.cpp:

(JSC::DFG::SpeculativeJIT::compile):

File:

• trunk/Source/JavaScriptCore/bytecode/ExitKind.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/bytecode/ExitKind.h

@@ -36 +36 @@
     BadCache, // We exited because an inline cache was wrong.
     BadWeakConstantCache, // We exited because a cache on a weak constant (usually a prototype) was wrong.
+    BadCacheWatchpoint, // Same as BadCache but from a watchpoint.
+    BadWeakConstantCacheWatchpoint, // Same as BadWeakConstantCache but from a watchpoint.
     BadIndexingType, // We exited because an indexing type was wrong.
     Overflow, // We exited because of overflow.
@@ -55 +57 @@
 bool exitKindIsCountable(ExitKind);
 
+inline bool isWatchpoint(ExitKind kind)
+{
+    switch (kind) {
+    case BadCacheWatchpoint:
+    case BadWeakConstantCacheWatchpoint:
+    case UncountableWatchpoint:
+        return true;
+    default:
+        return false;
+    }
+}
+
 } // namespace JSC