Changeset 172149 in webkit for trunk/Source/JavaScriptCore/ftl

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:

Location:

trunk/Source/JavaScriptCore/ftl

Files:

• FTLLowerDFGToLLVM.cpp (modified) (7 diffs)
• FTLState.cpp (modified) (2 diffs)
• FTLState.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp

@@ -29 +29 @@
 #if ENABLE(FTL_JIT)
 
-#include "BundlePath.h"
 #include "CodeBlockWithJITType.h"
 #include "DFGAbstractInterpreterInlines.h"
@@ -49 +48 @@
 #include <llvm/InitializeLLVM.h>
 #include <wtf/ProcessID.h>
+
+#if ENABLE(FTL_NATIVE_CALL_INLINING)
+#include "BundlePath.h"
+#endif
 
 namespace JSC { namespace FTL {
@@ -632 +635 @@
             compileCallOrConstruct();
             break;
+#if ENABLE(FTL_NATIVE_CALL_INLINING)
         case NativeCall:
         case NativeConstruct:
             compileNativeCallOrConstruct();
             break;
+#endif
         case Jump:
             compileJump();
@@ -3631 +3636 @@
         setBoolean(m_out.bitNot(boolify(m_node->child1())));
     }
-
+#if ENABLE(FTL_NATIVE_CALL_INLINING)
     void compileNativeCallOrConstruct() 
     {
@@ -3685 +3690 @@
         setJSValue(call);
     }
+#endif
 
     void compileCallOrConstruct()
@@ -4097 +4103 @@
     }
     
+#if ENABLE(FTL_NATIVE_CALL_INLINING)
     LValue getFunctionBySymbol(const CString symbol)
     {
@@ -4196 +4203 @@
         return true;
     }
+#endif
 
     bool isInlinableSize(LValue function)

trunk/Source/JavaScriptCore/ftl/FTLState.cpp

@@ -33 +33 @@
 #include "FTLJITCode.h"
 #include "FTLJITFinalizer.h"
-#include "InlineRuntimeSymbolTable.h"
 #include <llvm/InitializeLLVM.h>
 #include <stdio.h>
+
+#if ENABLE(FTL_NATIVE_CALL_INLINING)
+#include "InlineRuntimeSymbolTable.h"
+#endif
 
 namespace JSC { namespace FTL {
@@ -51 +54 @@
 {
 
+#if ENABLE(FTL_NATIVE_CALL_INLINING)
 #define SYMBOL_TABLE_ADD(symbol, file) \
     symbolTable.fastAdd(symbol, file);
     FOR_EACH_LIBRARY_SYMBOL(SYMBOL_TABLE_ADD)
 #undef SYMBOL_TABLE_ADD
+#endif
     
     switch (graph.m_plan.mode) {

trunk/Source/JavaScriptCore/ftl/FTLState.h

@@ -85 +85 @@
 
     HashSet<CString> nativeLoadedLibraries;
+
+#if ENABLE(FTL_NATIVE_CALL_INLINING)
     HashMap<CString, CString> symbolTable;
+#endif
 };