FTL_USES_B3 should be unconditionally true

https://bugs.webkit.org/show_bug.cgi?id=154324

Reviewed by Benjamin Poulain.

Source/JavaScriptCore:

* dfg/DFGCommon.h:

Source/WTF:

* wtf/Platform.h:

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

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 871e7bb..5ec31a9 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,5 +1,14 @@
 2016-02-16  Filip Pizlo  <fpizlo@apple.com>
 
+        FTL_USES_B3 should be unconditionally true
+        https://bugs.webkit.org/show_bug.cgi?id=154324
+
+        Reviewed by Benjamin Poulain.
+
+        * dfg/DFGCommon.h:
+
+2016-02-16  Filip Pizlo  <fpizlo@apple.com>
+
         FTL should support CompareEq(String:, String:)
         https://bugs.webkit.org/show_bug.cgi?id=154269
         rdar://problem/24499921

diff --git a/Source/JavaScriptCore/dfg/DFGCommon.h b/Source/JavaScriptCore/dfg/DFGCommon.h
index 16b448f..5d89fd8 100644 (file)
--- a/Source/JavaScriptCore/dfg/DFGCommon.h
+++ b/Source/JavaScriptCore/dfg/DFGCommon.h
@@ -36,12 +36,9 @@
 namespace JSC { namespace DFG {
 
 // We are in the middle of a transition from LLVM to B3 as the backend for the FTL. This flag will go
-// away once that transition is finished. For now, we enable B3 only on some platforms.
-#if (CPU(X86_64) || CPU(ARM64)) && ENABLE(FTL_JIT)
+// away once that transition is finished. For now, we enable B3 by default but we still have some old
+// LLVM code that hasn't been removed yet.
 #define FTL_USES_B3 1
-#else
-#define FTL_USES_B3 0
-#endif
 
 struct Node;
 

diff --git a/Source/JavaScriptCore/jit/PCToCodeOriginMap.cpp b/Source/JavaScriptCore/jit/PCToCodeOriginMap.cpp
index 6e949ce..8676d2d 100644 (file)
--- a/Source/JavaScriptCore/jit/PCToCodeOriginMap.cpp
+++ b/Source/JavaScriptCore/jit/PCToCodeOriginMap.cpp
@@ -104,7 +104,7 @@ PCToCodeOriginMapBuilder::PCToCodeOriginMapBuilder(PCToCodeOriginMapBuilder&& ot
     , m_shouldBuildMapping(other.m_shouldBuildMapping)
 { }
 
-#if FTL_USES_B3
+#if ENABLE(FTL_JIT)
 PCToCodeOriginMapBuilder::PCToCodeOriginMapBuilder(VM& vm, B3::PCToOriginMap&& b3PCToOriginMap)
     : m_vm(vm)
     , m_shouldBuildMapping(vm.shouldBuilderPCToCodeOriginMapping())

diff --git a/Source/JavaScriptCore/jit/PCToCodeOriginMap.h b/Source/JavaScriptCore/jit/PCToCodeOriginMap.h
index 57cf6c1..75b5444 100644 (file)
--- a/Source/JavaScriptCore/jit/PCToCodeOriginMap.h
+++ b/Source/JavaScriptCore/jit/PCToCodeOriginMap.h
@@ -39,7 +39,7 @@
 
 namespace JSC {
 
-#if FTL_USES_B3
+#if ENABLE(FTL_JIT)
 namespace B3 {
 class PCToOriginMap;
 }
@@ -56,7 +56,7 @@ public:
     PCToCodeOriginMapBuilder(VM&);
     PCToCodeOriginMapBuilder(PCToCodeOriginMapBuilder&& other);
 
-#if FTL_USES_B3
+#if ENABLE(FTL_JIT)
     PCToCodeOriginMapBuilder(VM&, B3::PCToOriginMap&&);
 #endif
 

diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index af12678..dca3df2 100644 (file)
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,12 @@
+2016-02-16  Filip Pizlo  <fpizlo@apple.com>
+
+        FTL_USES_B3 should be unconditionally true
+        https://bugs.webkit.org/show_bug.cgi?id=154324
+
+        Reviewed by Benjamin Poulain.
+
+        * wtf/Platform.h:
+
 2016-02-13  Mark Lam  <mark.lam@apple.com>
 
         Eliminate the need for WTFCrashImpl().

diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
index 58e03dc..e4ef0dc 100644 (file)
--- a/Source/WTF/wtf/Platform.h
+++ b/Source/WTF/wtf/Platform.h
@@ -782,7 +782,7 @@
 #endif
 
 /* This controls whether B3 is built. It will not be used unless FTL_USES_B3 is enabled. */
-#if (CPU(X86_64) || CPU(ARM64)) && ENABLE(FTL_JIT)
+#if ENABLE(FTL_JIT)
 #define ENABLE_B3_JIT 1
 #endif