Changeset 153115 in webkit for trunk/Source/JavaScriptCore/jit/JITDriver.h

Timestamp:

Jul 24, 2013, 8:58:16 PM (12 years ago)

Author:

[email protected]

Message:

fourthTier: Everyone should know about the FTL
​https://bugs.webkit.org/show_bug.cgi?id=113897

Reviewed by Mark Hahnenberg.

In order to get OSR exit to work right, we need the distinction between DFG and
FTL to be clear even after compilation finishes, since they will have subtly
different OSR stories and likely use different data structures.

• bytecode/CodeBlock.cpp:

(JSC::CodeBlock::resetStubInternal):
(JSC::ProgramCodeBlock::compileOptimized):
(JSC::EvalCodeBlock::compileOptimized):
(JSC::FunctionCodeBlock::compileOptimized):
(JSC::CodeBlock::adjustedExitCountThreshold):
(JSC::CodeBlock::tallyFrequentExitSites):

• bytecode/CodeBlock.h:

(JSC::CodeBlock::setJITCode):
(JSC::CodeBlock::hasOptimizedReplacement):
(JSC::ExecState::isInlineCallFrame):

• ftl/FTLCompile.cpp:

(JSC::FTL::compile):

• ftl/FTLJITCode.cpp:

(JSC::FTL::JITCode::JITCode):

• ftl/FTLState.cpp:

(JSC::FTL::State::dumpState):

• heap/DFGCodeBlocks.cpp:

(JSC::DFGCodeBlocks::jettison):

• interpreter/Interpreter.cpp:

(JSC::getLineNumberForCallFrame):
(JSC::getCallerInfo):

• jit/JITCode.cpp:

(WTF::printInternal):

• jit/JITCode.h:

(JSC::JITCode::topTierJIT):
(JSC::JITCode::nextTierJIT):
(JITCode):
(JSC::JITCode::isJIT):
(JSC::JITCode::isLowerTier):
(JSC::JITCode::isHigherTier):
(JSC::JITCode::isLowerOrSameTier):
(JSC::JITCode::isHigherOrSameTier):
(JSC::JITCode::isOptimizingJIT):

• jit/JITDriver.h:

(JSC::jitCompileIfAppropriate):
(JSC::jitCompileFunctionIfAppropriate):

• jit/JITStubs.cpp:

(JSC::DEFINE_STUB_FUNCTION):

• runtime/Executable.cpp:

(JSC::EvalExecutable::compileOptimized):
(JSC::samplingDescription):
(JSC::ProgramExecutable::compileOptimized):
(JSC::FunctionExecutable::compileOptimizedForCall):
(JSC::FunctionExecutable::compileOptimizedForConstruct):

File:

• trunk/Source/JavaScriptCore/jit/JITDriver.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/jit/JITDriver.h

@@ -54 +54 @@
     
     bool dfgCompiled = false;
-    if (jitType == JITCode::DFGJIT)
+    if (JITCode::isOptimizingJIT(jitType))
         dfgCompiled = DFG::tryCompile(exec, codeBlock.get(), jitCode, bytecodeIndex);
     if (dfgCompiled) {
@@ -92 +92 @@
     
     bool dfgCompiled = false;
-    if (jitType == JITCode::DFGJIT)
+    if (JITCode::isOptimizingJIT(jitType))
         dfgCompiled = DFG::tryCompileFunction(exec, codeBlock.get(), jitCode, jitCodeWithArityCheck, bytecodeIndex);
     if (dfgCompiled) {