Title: [196686] trunk/Source
- Revision
- 196686
- Author
- [email protected]
- Date
- 2016-02-16 22:13:24 -0800 (Tue, 16 Feb 2016)
Log Message
FTL_USES_B3 should be unconditionally true
https://bugs.webkit.org/show_bug.cgi?id=154324
Reviewed by Benjamin Poulain.
Source/_javascript_Core:
* dfg/DFGCommon.h:
Source/WTF:
* wtf/Platform.h:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (196685 => 196686)
--- trunk/Source/_javascript_Core/ChangeLog 2016-02-17 05:29:34 UTC (rev 196685)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-02-17 06:13:24 UTC (rev 196686)
@@ -1,5 +1,14 @@
2016-02-16 Filip Pizlo <[email protected]>
+ 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 <[email protected]>
+
FTL should support CompareEq(String:, String:)
https://bugs.webkit.org/show_bug.cgi?id=154269
rdar://problem/24499921
Modified: trunk/Source/_javascript_Core/dfg/DFGCommon.h (196685 => 196686)
--- trunk/Source/_javascript_Core/dfg/DFGCommon.h 2016-02-17 05:29:34 UTC (rev 196685)
+++ trunk/Source/_javascript_Core/dfg/DFGCommon.h 2016-02-17 06:13:24 UTC (rev 196686)
@@ -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;
Modified: trunk/Source/_javascript_Core/jit/PCToCodeOriginMap.cpp (196685 => 196686)
--- trunk/Source/_javascript_Core/jit/PCToCodeOriginMap.cpp 2016-02-17 05:29:34 UTC (rev 196685)
+++ trunk/Source/_javascript_Core/jit/PCToCodeOriginMap.cpp 2016-02-17 06:13:24 UTC (rev 196686)
@@ -104,7 +104,7 @@
, 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())
Modified: trunk/Source/_javascript_Core/jit/PCToCodeOriginMap.h (196685 => 196686)
--- trunk/Source/_javascript_Core/jit/PCToCodeOriginMap.h 2016-02-17 05:29:34 UTC (rev 196685)
+++ trunk/Source/_javascript_Core/jit/PCToCodeOriginMap.h 2016-02-17 06:13:24 UTC (rev 196686)
@@ -39,7 +39,7 @@
namespace JSC {
-#if FTL_USES_B3
+#if ENABLE(FTL_JIT)
namespace B3 {
class PCToOriginMap;
}
@@ -56,7 +56,7 @@
PCToCodeOriginMapBuilder(VM&);
PCToCodeOriginMapBuilder(PCToCodeOriginMapBuilder&& other);
-#if FTL_USES_B3
+#if ENABLE(FTL_JIT)
PCToCodeOriginMapBuilder(VM&, B3::PCToOriginMap&&);
#endif
Modified: trunk/Source/WTF/ChangeLog (196685 => 196686)
--- trunk/Source/WTF/ChangeLog 2016-02-17 05:29:34 UTC (rev 196685)
+++ trunk/Source/WTF/ChangeLog 2016-02-17 06:13:24 UTC (rev 196686)
@@ -1,3 +1,12 @@
+2016-02-16 Filip Pizlo <[email protected]>
+
+ 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 <[email protected]>
Eliminate the need for WTFCrashImpl().
Modified: trunk/Source/WTF/wtf/Platform.h (196685 => 196686)
--- trunk/Source/WTF/wtf/Platform.h 2016-02-17 05:29:34 UTC (rev 196685)
+++ trunk/Source/WTF/wtf/Platform.h 2016-02-17 06:13:24 UTC (rev 196686)
@@ -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
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes