Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (154508 => 154509)
--- trunk/Source/_javascript_Core/ChangeLog 2013-08-23 19:31:29 UTC (rev 154508)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-08-23 19:41:54 UTC (rev 154509)
@@ -1,3 +1,17 @@
+2013-08-22 Filip Pizlo <[email protected]>
+
+ build-jsc --ftl-jit should work
+ https://bugs.webkit.org/show_bug.cgi?id=120194
+
+ Reviewed by Oliver Hunt.
+
+ * Configurations/Base.xcconfig: CPPFLAGS should include FEATURE_DEFINES
+ * Configurations/JSC.xcconfig: The 'jsc' tool includes headers where field layout may depend on FEATURE_DEFINES
+ * Configurations/ToolExecutable.xcconfig: All other tools include headers where field layout may depend on FEATURE_DEFINES
+ * ftl/FTLLowerDFGToLLVM.cpp: Build fix
+ (JSC::FTL::LowerDFGToLLVM::compilePutStructure):
+ (JSC::FTL::LowerDFGToLLVM::compilePhantomPutStructure):
+
2013-08-23 Oliver Hunt <[email protected]>
Re-sort xcode project file
Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (154508 => 154509)
--- trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2013-08-23 19:31:29 UTC (rev 154508)
+++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2013-08-23 19:41:54 UTC (rev 154509)
@@ -43,7 +43,7 @@
GCC_MODEL_TUNING_macosx = G5;
GCC_OBJC_CALL_CXX_CDTORS = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
-GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) HAVE_DTRACE=$(HAVE_DTRACE) WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST HAVE_HEADER_DETECTION_H $(GCC_PREPROCESSOR_DEFINITIONS);
+GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) HAVE_DTRACE=$(HAVE_DTRACE) WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST HAVE_HEADER_DETECTION_H $(FEATURE_DEFINES) $(GCC_PREPROCESSOR_DEFINITIONS);
GCC_STRICT_ALIASING = YES;
GCC_THREADSAFE_STATICS = NO;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
Modified: trunk/Source/_javascript_Core/Configurations/JSC.xcconfig (154508 => 154509)
--- trunk/Source/_javascript_Core/Configurations/JSC.xcconfig 2013-08-23 19:31:29 UTC (rev 154508)
+++ trunk/Source/_javascript_Core/Configurations/JSC.xcconfig 2013-08-23 19:41:54 UTC (rev 154509)
@@ -21,6 +21,9 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#include "FeatureDefines.xcconfig"
+#include "Version.xcconfig"
+
INSTALL_PATH = $(_javascript_CORE_FRAMEWORKS_DIR)/_javascript_Core.framework/Versions/A/Resources
PRODUCT_NAME = jsc;
CODE_SIGN_ENTITLEMENTS = $(CODE_SIGN_ENTITLEMENTS_$(PLATFORM_NAME));
Modified: trunk/Source/_javascript_Core/Configurations/ToolExecutable.xcconfig (154508 => 154509)
--- trunk/Source/_javascript_Core/Configurations/ToolExecutable.xcconfig 2013-08-23 19:31:29 UTC (rev 154508)
+++ trunk/Source/_javascript_Core/Configurations/ToolExecutable.xcconfig 2013-08-23 19:41:54 UTC (rev 154509)
@@ -21,6 +21,9 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#include "FeatureDefines.xcconfig"
+#include "Version.xcconfig"
+
INSTALL_PATH = $(INSTALL_PATH_$(PLATFORM_NAME));
INSTALL_PATH_iphoneos = $(_javascript_CORE_FRAMEWORKS_DIR)/_javascript_Core.framework/Resources;
INSTALL_PATH_iphonesimulator = $(INSTALL_PATH_iphoneos);
Modified: trunk/Source/_javascript_Core/ftl/FTLLowerDFGToLLVM.cpp (154508 => 154509)
--- trunk/Source/_javascript_Core/ftl/FTLLowerDFGToLLVM.cpp 2013-08-23 19:31:29 UTC (rev 154508)
+++ trunk/Source/_javascript_Core/ftl/FTLLowerDFGToLLVM.cpp 2013-08-23 19:41:54 UTC (rev 154509)
@@ -1160,7 +1160,7 @@
void compilePutStructure()
{
- m_ftlState.jitCode->common.notifyCompilingStructureTransition(codeBlock(), m_node);
+ m_ftlState.jitCode->common.notifyCompilingStructureTransition(m_graph.m_plan, codeBlock(), m_node);
m_out.store64(
m_out.constIntPtr(m_node->structureTransitionData().newStructure),
@@ -1169,7 +1169,7 @@
void compilePhantomPutStructure()
{
- m_ftlState.jitCode->common.notifyCompilingStructureTransition(codeBlock(), m_node);
+ m_ftlState.jitCode->common.notifyCompilingStructureTransition(m_graph.m_plan, codeBlock(), m_node);
}
void compileGetButterfly()
Modified: trunk/Source/WTF/ChangeLog (154508 => 154509)
--- trunk/Source/WTF/ChangeLog 2013-08-23 19:31:29 UTC (rev 154508)
+++ trunk/Source/WTF/ChangeLog 2013-08-23 19:41:54 UTC (rev 154509)
@@ -1,3 +1,12 @@
+2013-08-22 Filip Pizlo <[email protected]>
+
+ build-jsc --ftl-jit should work
+ https://bugs.webkit.org/show_bug.cgi?id=120194
+
+ Reviewed by Oliver Hunt.
+
+ * wtf/LLVMHeaders.h: I don't know what went wrong here. If HAVE(LLVM), then we need those headers!
+
2013-08-23 Brent Fulgham <[email protected]>
[Windows] Unreviewed build correction after r154498.
Modified: trunk/Source/WTF/wtf/LLVMHeaders.h (154508 => 154509)
--- trunk/Source/WTF/wtf/LLVMHeaders.h 2013-08-23 19:31:29 UTC (rev 154508)
+++ trunk/Source/WTF/wtf/LLVMHeaders.h 2013-08-23 19:41:54 UTC (rev 154509)
@@ -28,7 +28,7 @@
#include <wtf/Platform.h>
-#if HAVE(LLVM) && ENABLE(FTL_JIT) && 0
+#if HAVE(LLVM)
// It is necessary to include LLVM headers via this file, because:
// - LLVM requires defining things that we don't normally define, and
Modified: trunk/Tools/ChangeLog (154508 => 154509)
--- trunk/Tools/ChangeLog 2013-08-23 19:31:29 UTC (rev 154508)
+++ trunk/Tools/ChangeLog 2013-08-23 19:41:54 UTC (rev 154509)
@@ -1,3 +1,12 @@
+2013-08-22 Filip Pizlo <[email protected]>
+
+ build-jsc --ftl-jit should work
+ https://bugs.webkit.org/show_bug.cgi?id=120194
+
+ Reviewed by Oliver Hunt.
+
+ * Scripts/build-jsc: Need to pass the feature flag to xcodebuild
+
2013-08-23 Commit Queue <[email protected]>
Unreviewed, rolling out r153534.
Modified: trunk/Tools/Scripts/build-jsc (154508 => 154509)
--- trunk/Tools/Scripts/build-jsc 2013-08-23 19:31:29 UTC (rev 154508)
+++ trunk/Tools/Scripts/build-jsc 2013-08-23 19:41:54 UTC (rev 154509)
@@ -78,7 +78,10 @@
}
if (isAppleMacWebKit()) {
- $ENV{ENABLE_FTL_JIT} = 1 if $ftlJIT;
+ if ($ftlJIT) {
+ $ENV{ENABLE_FTL_JIT} = 1;
+ push @options, "ENABLE_FTL_JIT=ENABLE_FTL_JIT";
+ }
(system("perl", "Tools/Scripts/copy-webkitlibraries-to-product-directory", productDir()) == 0) or die;
}
