Changeset 172149 in webkit for trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp

Timestamp:

Aug 6, 2014, 8:44:57 AM (11 years ago)

Author:

Dániel Bátyai

Message:

[JSC] Build fix for FTL on EFL after ftlopt merge
​https://bugs.webkit.org/show_bug.cgi?id=135565

Reviewed by Mark Lam.

Source/JavaScriptCore:

Adding an enable guard for native inlining, since it now requires the bitcode
emitted from Clang, and we don't have a good way of creating it from other compilers.

• dfg/DFGByteCodeParser.cpp:

(JSC::DFG::ByteCodeParser::handleCall):

• ftl/FTLLowerDFGToLLVM.cpp:

(JSC::FTL::LowerDFGToLLVM::compileNode):

• ftl/FTLState.cpp:

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

• ftl/FTLState.h:

Source/WTF:

Added ENABLE(FTL_NATIVE_CALL_INLINING).

• wtf/Platform.h:

File:

• trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp

@@ -1068 +1068 @@
             m_graph.compilation()->noticeInlinedCall();
         return;
+#if ENABLE(FTL_NATIVE_CALL_INLINING)
     } else if (isFTL(m_graph.m_plan.mode) && Options::optimizeNativeCalls()) {
         JSFunction* function = callLinkStatus.function();
@@ -1081 +1082 @@
             }
         }
+#endif
     }
     Node* call = addCall(result, op, callTarget, argumentCountIncludingThis, registerOffset, prediction);