<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[196077] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/196077">196077</a></dd>
<dt>Author</dt> <dd>mcatanzaro@igalia.com</dd>
<dt>Date</dt> <dd>2016-02-03 13:21:46 -0800 (Wed, 03 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK][EFL] Switch FTL to B3
https://bugs.webkit.org/show_bug.cgi?id=153478
Reviewed by Csaba Osztrogonác.
.:
* Source/cmake/OptionsEfl.cmake:
* Source/cmake/OptionsGTK.cmake:
Source/JavaScriptCore:
Conditionalize code to make it possible to build FTL completely without LLVM.
* CMakeLists.txt:
* dfg/DFGCommon.h:
* dfg/DFGPlan.cpp:
(JSC::DFG::Plan::compileInThreadImpl):
* ftl/FTLAbbreviatedTypes.h:
* ftl/FTLFail.cpp:
(JSC::FTL::fail):
* ftl/FTLState.cpp:
(JSC::FTL::State::State):
(JSC::FTL::State::~State):
Source/WTF:
Enable B3 by default on all x86.
* wtf/Platform.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreCMakeListstxt">trunk/Source/JavaScriptCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorePlatformGTKcmake">trunk/Source/JavaScriptCore/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGCommonh">trunk/Source/JavaScriptCore/dfg/DFGCommon.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGPlancpp">trunk/Source/JavaScriptCore/dfg/DFGPlan.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLAbbreviatedTypesh">trunk/Source/JavaScriptCore/ftl/FTLAbbreviatedTypes.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLFailcpp">trunk/Source/JavaScriptCore/ftl/FTLFail.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLStatecpp">trunk/Source/JavaScriptCore/ftl/FTLState.cpp</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform.h</a></li>
<li><a href="#trunkSourcecmakeOptionsEflcmake">trunk/Source/cmake/OptionsEfl.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsGTKcmake">trunk/Source/cmake/OptionsGTK.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (196076 => 196077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2016-02-03 21:10:08 UTC (rev 196076)
+++ trunk/ChangeLog 2016-02-03 21:21:46 UTC (rev 196077)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-02-03 Michael Catanzaro <mcatanzaro@igalia.com>
+
+ [GTK][EFL] Switch FTL to B3
+ https://bugs.webkit.org/show_bug.cgi?id=153478
+
+ Reviewed by Csaba Osztrogonác.
+
+ * Source/cmake/OptionsEfl.cmake:
+ * Source/cmake/OptionsGTK.cmake:
+
</ins><span class="cx"> 2016-02-02 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed attempt to fix Mac CMake build after r195999.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (196076 => 196077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2016-02-03 21:10:08 UTC (rev 196076)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2016-02-03 21:21:46 UTC (rev 196077)
</span><span class="lines">@@ -991,36 +991,11 @@
</span><span class="cx"> llint/LowLevelInterpreter.cpp
</span><span class="cx"> )
</span><span class="cx">
</span><del>-
</del><span class="cx"> if (ENABLE_FTL_JIT)
</span><del>- # Configure llvmForJSC.so
- set(llvmForJSC_SOURCES
- llvm/library/LLVMAnchor.cpp
- llvm/library/LLVMExports.cpp
- llvm/library/LLVMOverrides.cpp
- )
- set(llvmForJSC_INCLUDE_DIRECTORIES
- ${LLVM_INCLUDE_DIRS}
- "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
- )
-
- add_custom_command(
- OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/WebKitLLVMLibraryToken.h
- COMMAND ${CMAKE_COMMAND} -E touch ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/WebKitLLVMLibraryToken.h
- VERBATIM)
-
- # Added extra items for JavaScriptCore
- list(APPEND JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES
- ${LLVM_INCLUDE_DIRS}
- )
-
</del><span class="cx"> list(APPEND JavaScriptCore_SOURCES
</span><span class="cx"> dfg/DFGToFTLDeferredCompilationCallback.cpp
</span><span class="cx"> dfg/DFGToFTLForOSREntryDeferredCompilationCallback.cpp
</span><span class="cx">
</span><del>- disassembler/LLVMDisassembler.cpp
- disassembler/X86Disassembler.cpp
-
</del><span class="cx"> ftl/FTLAbstractHeap.cpp
</span><span class="cx"> ftl/FTLAbstractHeapRepository.cpp
</span><span class="cx"> ftl/FTLAvailableRecovery.cpp
</span><span class="lines">@@ -1071,7 +1046,32 @@
</span><span class="cx"> ftl/FTLThunks.cpp
</span><span class="cx"> ftl/FTLUnwindInfo.cpp
</span><span class="cx"> ftl/FTLValueRange.cpp
</span><ins>+ )
+endif ()
</ins><span class="cx">
</span><ins>+if (USE_LLVM_DISASSEMBLER)
+ # Configure llvmForJSC.so
+ set(llvmForJSC_SOURCES
+ llvm/library/LLVMAnchor.cpp
+ llvm/library/LLVMExports.cpp
+ llvm/library/LLVMOverrides.cpp
+ )
+ set(llvmForJSC_INCLUDE_DIRECTORIES
+ ${LLVM_INCLUDE_DIRS}
+ "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
+ )
+
+ add_custom_command(
+ OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/WebKitLLVMLibraryToken.h
+ COMMAND ${CMAKE_COMMAND} -E touch ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/WebKitLLVMLibraryToken.h
+ VERBATIM)
+
+ # Added extra items for JavaScriptCore
+ list(APPEND JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES
+ ${LLVM_INCLUDE_DIRS}
+ )
+
+ list(APPEND JavaScriptCore_SOURCES
</ins><span class="cx"> llvm/InitializeLLVM.cpp
</span><span class="cx"> llvm/LLVMAPI.cpp
</span><span class="cx"> )
</span><span class="lines">@@ -1366,12 +1366,12 @@
</span><span class="cx">
</span><span class="cx"> WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
</span><span class="cx">
</span><del>-if (ENABLE_FTL_JIT AND NOT WIN32)
</del><ins>+if (USE_LLVM_DISASSEMBLER AND NOT WIN32)
</ins><span class="cx"> if (NOT llvmForJSC_LIBRARIES)
</span><span class="cx"> set(llvmForJSC_LIBRARIES ${LLVM_STATIC_LIBRARIES})
</span><span class="cx"> endif ()
</span><span class="cx"> if (NOT llvmForJSC_LIBRARIES)
</span><del>- message(FATAL_ERROR "No LLVM libs found, but FTL is enabled. Stopping build.")
</del><ins>+ message(FATAL_ERROR "No LLVM libs found, but LLVM disassembler is enabled. Stopping build.")
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> WEBKIT_WRAP_SOURCELIST(${llvmForJSC_SOURCES})
</span><span class="lines">@@ -1416,7 +1416,7 @@
</span><span class="cx"> install(TARGETS JavaScriptCore DESTINATION "${LIB_INSTALL_DIR}")
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-if (ENABLE_FTL_JIT)
</del><ins>+if (USE_LLVM_DISASSEMBLER)
</ins><span class="cx"> add_dependencies(JavaScriptCore llvmForJSC)
</span><span class="cx"> endif ()
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (196076 => 196077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-02-03 21:10:08 UTC (rev 196076)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-02-03 21:21:46 UTC (rev 196077)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-02-03 Michael Catanzaro <mcatanzaro@igalia.com>
+
+ [GTK][EFL] Switch FTL to B3
+ https://bugs.webkit.org/show_bug.cgi?id=153478
+
+ Reviewed by Csaba Osztrogonác.
+
+ Conditionalize code to make it possible to build FTL completely without LLVM.
+
+ * CMakeLists.txt:
+ * dfg/DFGCommon.h:
+ * dfg/DFGPlan.cpp:
+ (JSC::DFG::Plan::compileInThreadImpl):
+ * ftl/FTLAbbreviatedTypes.h:
+ * ftl/FTLFail.cpp:
+ (JSC::FTL::fail):
+ * ftl/FTLState.cpp:
+ (JSC::FTL::State::State):
+ (JSC::FTL::State::~State):
+
</ins><span class="cx"> 2016-02-03 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Fix JavaScriptCore build with B3 enabled.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/PlatformGTK.cmake (196076 => 196077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/PlatformGTK.cmake 2016-02-03 21:10:08 UTC (rev 196076)
+++ trunk/Source/JavaScriptCore/PlatformGTK.cmake 2016-02-03 21:21:46 UTC (rev 196077)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> )
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-if (ENABLE_FTL_JIT)
</del><ins>+if (USE_LLVM_DISASSEMBLER)
</ins><span class="cx"> set(llvmForJSC_LIBRARIES ${LLVM_LIBRARIES})
</span><span class="cx"> set(llvmForJSC_INSTALL_DIR "${LIB_INSTALL_DIR}/javascriptcoregtk-${WEBKITGTK_API_VERSION}")
</span><span class="cx"> endif ()
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGCommonh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGCommon.h (196076 => 196077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGCommon.h 2016-02-03 21:10:08 UTC (rev 196076)
+++ trunk/Source/JavaScriptCore/dfg/DFGCommon.h 2016-02-03 21:21:46 UTC (rev 196077)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx">
</span><span class="cx"> // We are in the middle of a transition from LLVM to B3 as the backend for the FTL. This flag will go
</span><span class="cx"> // away once that transition is finished. For now, we enable B3 only on some platforms.
</span><del>-#if CPU(X86_64) && PLATFORM(MAC) && ENABLE(FTL_JIT)
</del><ins>+#if CPU(X86_64) && ENABLE(FTL_JIT)
</ins><span class="cx"> #define FTL_USES_B3 1
</span><span class="cx"> #else
</span><span class="cx"> #define FTL_USES_B3 0
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGPlancpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGPlan.cpp (196076 => 196077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGPlan.cpp 2016-02-03 21:10:08 UTC (rev 196076)
+++ trunk/Source/JavaScriptCore/dfg/DFGPlan.cpp 2016-02-03 21:21:46 UTC (rev 196077)
</span><span class="lines">@@ -455,15 +455,20 @@
</span><span class="cx">
</span><span class="cx"> dumpAndVerifyGraph(dfg, "Graph just before FTL lowering:", shouldDumpDisassembly(mode));
</span><span class="cx">
</span><ins>+#if HAVE(LLVM) && !FTL_USES_B3
</ins><span class="cx"> bool haveLLVM;
</span><ins>+#endif
</ins><span class="cx"> Safepoint::Result safepointResult;
</span><span class="cx"> {
</span><span class="cx"> GraphSafepoint safepoint(dfg, safepointResult);
</span><ins>+#if HAVE(LLVM) && !FTL_USES_B3
</ins><span class="cx"> haveLLVM = initializeLLVM();
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx"> if (safepointResult.didGetCancelled())
</span><span class="cx"> return CancelPath;
</span><del>-
</del><ins>+
+#if HAVE(LLVM) && !FTL_USES_B3
</ins><span class="cx"> if (!haveLLVM) {
</span><span class="cx"> if (Options::ftlCrashesIfCantInitializeLLVM()) {
</span><span class="cx"> dataLog("LLVM can't be initialized.\n");
</span><span class="lines">@@ -472,6 +477,7 @@
</span><span class="cx"> finalizer = std::make_unique<FailedFinalizer>(*this);
</span><span class="cx"> return FailPath;
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> FTL::State state(dfg);
</span><span class="cx"> FTL::lowerDFGToLLVM(state);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLAbbreviatedTypesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLAbbreviatedTypes.h (196076 => 196077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLAbbreviatedTypes.h 2016-02-03 21:10:08 UTC (rev 196076)
+++ trunk/Source/JavaScriptCore/ftl/FTLAbbreviatedTypes.h 2016-02-03 21:21:46 UTC (rev 196077)
</span><span class="lines">@@ -43,11 +43,20 @@
</span><span class="cx"> typedef B3::BasicBlock* LBasicBlock;
</span><span class="cx"> typedef B3::Type LType;
</span><span class="cx"> typedef B3::Value* LValue;
</span><ins>+
+typedef void* LAtomicOrdering;
+typedef void* LBuilder;
+typedef void* LCallConv;
+typedef void* LContext;
+typedef void* LIntPredicate;
+typedef void* LLinkage;
+typedef void* LModule;
+typedef void* LRealPredicate;
+typedef void* LMemoryBuffer;
</ins><span class="cx"> #else
</span><span class="cx"> typedef LLVMBasicBlockRef LBasicBlock;
</span><span class="cx"> typedef LLVMTypeRef LType;
</span><span class="cx"> typedef LLVMValueRef LValue;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> typedef LLVMAtomicOrdering LAtomicOrdering;
</span><span class="cx"> typedef LLVMBuilderRef LBuilder;
</span><span class="lines">@@ -58,6 +67,7 @@
</span><span class="cx"> typedef LLVMModuleRef LModule;
</span><span class="cx"> typedef LLVMRealPredicate LRealPredicate;
</span><span class="cx"> typedef LLVMMemoryBufferRef LMemoryBuffer;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> enum SynchronizationScope { SingleThread, CrossThread };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLFailcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLFail.cpp (196076 => 196077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLFail.cpp 2016-02-03 21:10:08 UTC (rev 196076)
+++ trunk/Source/JavaScriptCore/ftl/FTLFail.cpp 2016-02-03 21:21:46 UTC (rev 196077)
</span><span class="lines">@@ -40,8 +40,10 @@
</span><span class="cx"> {
</span><span class="cx"> state.graph.m_plan.finalizer = std::make_unique<FailedFinalizer>(state.graph.m_plan);
</span><span class="cx">
</span><ins>+#if !FTL_USES_B3
</ins><span class="cx"> if (state.module)
</span><span class="cx"> llvm->DisposeModule(state.module);
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } } // namespace JSC::FTL
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLStatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLState.cpp (196076 => 196077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLState.cpp 2016-02-03 21:10:08 UTC (rev 196076)
+++ trunk/Source/JavaScriptCore/ftl/FTLState.cpp 2016-02-03 21:21:46 UTC (rev 196077)
</span><span class="lines">@@ -44,7 +44,11 @@
</span><span class="cx">
</span><span class="cx"> State::State(Graph& graph)
</span><span class="cx"> : graph(graph)
</span><ins>+#if FTL_USES_B3
+ , context(nullptr)
+#else
</ins><span class="cx"> , context(llvm->ContextCreate())
</span><ins>+#endif
</ins><span class="cx"> , module(0)
</span><span class="cx"> , function(0)
</span><span class="cx"> , generatedFunction(0)
</span><span class="lines">@@ -85,7 +89,9 @@
</span><span class="cx">
</span><span class="cx"> State::~State()
</span><span class="cx"> {
</span><ins>+#if !FTL_USES_B3
</ins><span class="cx"> llvm->ContextDispose(context);
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void State::dumpState(const char* when)
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (196076 => 196077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-02-03 21:10:08 UTC (rev 196076)
+++ trunk/Source/WTF/ChangeLog 2016-02-03 21:21:46 UTC (rev 196077)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-02-03 Michael Catanzaro <mcatanzaro@igalia.com>
+
+ [GTK][EFL] Switch FTL to B3
+ https://bugs.webkit.org/show_bug.cgi?id=153478
+
+ Reviewed by Csaba Osztrogonác.
+
+ Enable B3 by default on all x86.
+
+ * wtf/Platform.h:
+
</ins><span class="cx"> 2016-02-03 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix BlockPtr's call operator
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (196076 => 196077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Platform.h 2016-02-03 21:10:08 UTC (rev 196076)
+++ trunk/Source/WTF/wtf/Platform.h 2016-02-03 21:21:46 UTC (rev 196077)
</span><span class="lines">@@ -716,10 +716,6 @@
</span><span class="cx"> #define HAVE_LLVM 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(GTK) && HAVE(LLVM) && ENABLE(JIT) && !defined(ENABLE_FTL_JIT) && CPU(X86_64)
-#define ENABLE_FTL_JIT 1
-#endif
-
</del><span class="cx"> /* The FTL *does not* work on 32-bit platforms. Disable it even if someone asked us to enable it. */
</span><span class="cx"> #if USE(JSVALUE32_64)
</span><span class="cx"> #undef ENABLE_FTL_JIT
</span><span class="lines">@@ -785,9 +781,8 @@
</span><span class="cx"> #define ENABLE_CONCURRENT_JIT 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-/* The B3 compiler is an experimental backend that is still in development. We will keep it building
- on Mac/x86-64 for now, though it is unused except for tests. */
-#if (PLATFORM(MAC) || PLATFORM(IOS)) && (CPU(X86_64) || CPU(ARM64)) && ENABLE(FTL_JIT)
</del><ins>+/* 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)
</ins><span class="cx"> #define ENABLE_B3_JIT 1
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsEfl.cmake (196076 => 196077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsEfl.cmake 2016-02-03 21:10:08 UTC (rev 196076)
+++ trunk/Source/cmake/OptionsEfl.cmake 2016-02-03 21:21:46 UTC (rev 196077)
</span><span class="lines">@@ -69,12 +69,6 @@
</span><span class="cx"> set(WebKit2_VERSION_SCRIPT "-Wl,--version-script,${CMAKE_MODULE_PATH}/eflsymbols.filter")
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-if (WTF_CPU_X86_64)
- set(ENABLE_FTL_DEFAULT ON)
-else ()
- set(ENABLE_FTL_DEFAULT OFF)
-endif ()
-
</del><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_TRANSFORMS PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCESSIBILITY PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ALLINONE_BUILD PUBLIC OFF)
</span><span class="lines">@@ -97,7 +91,7 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA PUBLIC OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA_V2 PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FILTERS_LEVEL_2 PUBLIC OFF)
</span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT PUBLIC ${ENABLE_FTL_DEFAULT})
</del><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT PUBLIC ${WTF_CPU_X86_64})
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FULLSCREEN_API PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD PUBLIC OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD_DEPRECATED PUBLIC ON)
</span><span class="lines">@@ -282,20 +276,15 @@
</span><span class="cx"> find_package(Espeak REQUIRED)
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-if (ENABLE_FTL_JIT)
- if (WTF_CPU_X86_64)
- find_package(LLVM 3.6.0 REQUIRED)
- elseif (WTF_CPU_ARM64)
- find_package(LLVM REQUIRED)
- if (NOT "${LLVM_VERSION}" STREQUAL "3.5.0ftl")
- message(FATAL_ERROR "FTL JIT is only available on AArch64 architecture with patched LLVM 3.5.0, use Tools/Scripts/update-webkitefl-libs llvm-3.5-for-AArch64 to build it.")
- endif ()
- else ()
- message(FATAL_ERROR "FTL JIT is only available on X86_64 and AArch64 architectures.")
- endif ()
</del><ins>+if (USE_LLVM_DISASSEMBLER)
+ find_package(LLVM REQUIRED)
</ins><span class="cx"> SET_AND_EXPOSE_TO_BUILD(HAVE_LLVM TRUE)
</span><span class="cx"> endif ()
</span><span class="cx">
</span><ins>+if (ENABLE_FTL_JIT AND NOT WTF_CPU_X86_64 AND NOT DEVELOPER_MODE)
+ message(FATAL_ERROR "FTL JIT is only available on X86_64 architecture.")
+endif ()
+
</ins><span class="cx"> if (ENABLE_SUBTLE_CRYPTO)
</span><span class="cx"> find_package(GnuTLS 3.0.0 REQUIRED)
</span><span class="cx"> endif ()
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (196076 => 196077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake 2016-02-03 21:10:08 UTC (rev 196076)
+++ trunk/Source/cmake/OptionsGTK.cmake 2016-02-03 21:21:46 UTC (rev 196077)
</span><span class="lines">@@ -66,12 +66,6 @@
</span><span class="cx"> set(ENABLE_GLES2_DEFAULT ON)
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-if (WTF_CPU_X86_64)
- set(ENABLE_FTL_DEFAULT ON)
-else ()
- set(ENABLE_FTL_DEFAULT OFF)
-endif ()
-
</del><span class="cx"> # Public options specific to the GTK+ port. Do not add any options here unless
</span><span class="cx"> # there is a strong reason we should support changing the value of the option,
</span><span class="cx"> # and the option is not relevant to any other WebKit ports.
</span><span class="lines">@@ -133,7 +127,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS PUBLIC OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CREDENTIAL_STORAGE PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT PUBLIC ON)
</span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT PUBLIC ${ENABLE_FTL_DEFAULT})
</del><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GEOLOCATION PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ICONDATABASE PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_JIT PUBLIC ON)
</span><span class="lines">@@ -153,6 +146,7 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SELECTORS_LEVEL4 PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATABASE_PROCESS PRIVATE ON)
</span><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT PRIVATE ${WTF_CPU_X86_64})
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTPDIR PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FULLSCREEN_API PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE PRIVATE ON)
</span><span class="lines">@@ -234,11 +228,11 @@
</span><span class="cx"> endif ()
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-if (ENABLE_FTL_JIT)
</del><ins>+if (USE_LLVM_DISASSEMBLER)
</ins><span class="cx"> if (WTF_CPU_X86_64)
</span><span class="cx"> find_package(LLVM 3.7)
</span><span class="cx"> if (NOT LLVM_FOUND)
</span><del>- message(FATAL_ERROR "LLVM 3.7 is required for ENABLE_FTL_JIT")
</del><ins>+ message(FATAL_ERROR "LLVM 3.7 is required for USE_LLVM_DISASSEMBLER")
</ins><span class="cx"> endif ()
</span><span class="cx"> SET_AND_EXPOSE_TO_BUILD(HAVE_LLVM TRUE)
</span><span class="cx"> else ()
</span></span></pre>
</div>
</div>
</body>
</html>