[B3][Win64] Compile fixes.
authorpeavo@outlook.com <peavo@outlook.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 2 Feb 2016 19:07:03 +0000 (19:07 +0000)
committerpeavo@outlook.com <peavo@outlook.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 2 Feb 2016 19:07:03 +0000 (19:07 +0000)
https://bugs.webkit.org/show_bug.cgi?id=153605

Reviewed by Filip Pizlo.

Fix remaining compile errors on Win64.

* CMakeLists.txt:
* b3/B3CFG.h:
(JSC::B3::CFG::newMap):
* ftl/FTLJITCode.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@196019 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/CMakeLists.txt
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/b3/B3CFG.h
Source/JavaScriptCore/ftl/FTLJITCode.h

index ae944c8..915e41a 100644 (file)
@@ -1071,10 +1071,14 @@ if (ENABLE_FTL_JIT)
         ftl/FTLValueRange.cpp
 
         llvm/InitializeLLVM.cpp
-        llvm/InitializeLLVMLinux.cpp
-        llvm/InitializeLLVMPOSIX.cpp
         llvm/LLVMAPI.cpp
     )
+    if (NOT WIN32)
+        list(APPEND JavaScriptCore_SOURCES
+            llvm/InitializeLLVMLinux.cpp
+            llvm/InitializeLLVMPOSIX.cpp
+        )
+    endif ()
 endif ()
 
 set(HASH_LUT_GENERATOR ${CMAKE_CURRENT_SOURCE_DIR}/create_hash_table)
@@ -1360,7 +1364,7 @@ endif ()
 
 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
 
-if (ENABLE_FTL_JIT)
+if (ENABLE_FTL_JIT AND NOT WIN32)
     if (NOT llvmForJSC_LIBRARIES)
         set(llvmForJSC_LIBRARIES ${LLVM_STATIC_LIBRARIES})
     endif ()
index 9f42c4b..ffc9a5c 100644 (file)
@@ -1,3 +1,17 @@
+2016-02-02  Per Arne Vollan  <peavo@outlook.com>
+
+        [B3][Win64] Compile fixes.
+        https://bugs.webkit.org/show_bug.cgi?id=153605
+
+        Reviewed by Filip Pizlo.
+
+        Fix remaining compile errors on Win64.
+
+        * CMakeLists.txt:
+        * b3/B3CFG.h:
+        (JSC::B3::CFG::newMap):
+        * ftl/FTLJITCode.h:
+
 2016-02-01  Chris Dumez  <cdumez@apple.com>
 
         object.__lookupGetter__() / object.__lookupSetter__() does not work for native bindings
index dd9dc09..58c40b1 100644 (file)
@@ -52,7 +52,7 @@ public:
     Node root() { return m_proc[0]; }
 
     template<typename T>
-    Map<T> newMap() { return IndexMap<BasicBlock, T>(m_proc.size()); }
+    Map<T> newMap() { return IndexMap<JSC::B3::BasicBlock, T>(m_proc.size()); }
 
     SuccessorCollection<BasicBlock, BasicBlock::SuccessorList> successors(Node node) { return node->successorBlocks(); }
     BasicBlock::PredecessorList& predecessors(Node node) { return node->predecessors(); }
index b18b976..7879db4 100644 (file)
@@ -39,6 +39,7 @@
 #include "LLVMAPI.h"
 #include <wtf/RefCountedArray.h>
 
+#if !FTL_USES_B3
 #if OS(DARWIN)
 #define SECTION_NAME_PREFIX "__"
 #elif OS(LINUX)
@@ -48,6 +49,7 @@
 #endif
 
 #define SECTION_NAME(NAME) (SECTION_NAME_PREFIX NAME)
+#endif // !FTL_USES_B3
 
 namespace JSC {