Title: [237484] trunk/Source/_javascript_Core
Revision
237484
Author
[email protected]
Date
2018-10-26 15:02:54 -0700 (Fri, 26 Oct 2018)

Log Message

Gardening: Build fix after r237479.
https://bugs.webkit.org/show_bug.cgi?id=187373

Unreviewed.

* Configurations/JSC.xcconfig:
* _javascript_Core.xcodeproj/project.pbxproj:
* llint/LLIntData.cpp:
(JSC::LLInt::initialize):

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (237483 => 237484)


--- trunk/Source/_javascript_Core/ChangeLog	2018-10-26 21:33:21 UTC (rev 237483)
+++ trunk/Source/_javascript_Core/ChangeLog	2018-10-26 22:02:54 UTC (rev 237484)
@@ -1,5 +1,17 @@
 2018-10-26  Tadeu Zagallo  <[email protected]>
 
+        Gardening: Build fix after r237479.
+        https://bugs.webkit.org/show_bug.cgi?id=187373
+
+        Unreviewed.
+
+        * Configurations/JSC.xcconfig:
+        * _javascript_Core.xcodeproj/project.pbxproj:
+        * llint/LLIntData.cpp:
+        (JSC::LLInt::initialize):
+
+2018-10-26  Tadeu Zagallo  <[email protected]>
+
         New bytecode format for JSC
         https://bugs.webkit.org/show_bug.cgi?id=187373
         <rdar://problem/44186758>

Modified: trunk/Source/_javascript_Core/Configurations/JSC.xcconfig (237483 => 237484)


--- trunk/Source/_javascript_Core/Configurations/JSC.xcconfig	2018-10-26 21:33:21 UTC (rev 237483)
+++ trunk/Source/_javascript_Core/Configurations/JSC.xcconfig	2018-10-26 22:02:54 UTC (rev 237484)
@@ -37,3 +37,4 @@
 
 // Explicitly add the PrivateHeaders directory to the search path so that generated header files can be found in production builds.
 HEADER_SEARCH_PATHS = "$(_javascript_CORE_FRAMEWORKS_DIR)/_javascript_Core.framework/PrivateHeaders" $(inherited);
+HEADER_SEARCH_PATHS = "${BUILT_PRODUCTS_DIR}/DerivedSources/_javascript_Core" $(HEADER_SEARCH_PATHS);

Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (237483 => 237484)


--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj	2018-10-26 21:33:21 UTC (rev 237483)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj	2018-10-26 22:02:54 UTC (rev 237484)
@@ -1864,6 +1864,13 @@
 			remoteGlobalIDString = 0F4680A914BA7FD900BFE272;
 			remoteInfo = "LLInt Offsets";
 		};
+		14013B752183C01E00999946 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 65FB3F6609D11E9100F49DEB;
+			remoteInfo = "Derived Sources";
+		};
 		14BD6883215191310050DAFF /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
@@ -9973,6 +9980,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				14013B762183C01E00999946 /* PBXTargetDependency */,
 			);
 			name = jsc;
 			productInstallPath = /usr/local/bin;
@@ -10588,6 +10596,11 @@
 			target = 0F4680A914BA7FD900BFE272 /* LLInt Offsets */;
 			targetProxy = 0FF922D214F46B2F0041A24E /* PBXContainerItemProxy */;
 		};
+		14013B762183C01E00999946 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 65FB3F6609D11E9100F49DEB /* Derived Sources */;
+			targetProxy = 14013B752183C01E00999946 /* PBXContainerItemProxy */;
+		};
 		14BD6882215191310050DAFF /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 65FB3F6609D11E9100F49DEB /* Derived Sources */;

Modified: trunk/Source/_javascript_Core/llint/LLIntData.cpp (237483 => 237484)


--- trunk/Source/_javascript_Core/llint/LLIntData.cpp	2018-10-26 21:33:21 UTC (rev 237483)
+++ trunk/Source/_javascript_Core/llint/LLIntData.cpp	2018-10-26 22:02:54 UTC (rev 237484)
@@ -51,7 +51,7 @@
 Opcode g_opcodeMap[numOpcodeIDs] = { };
 Opcode g_opcodeMapWide[numOpcodeIDs] = { };
 
-#if ENABLE(JIT)
+#if !ENABLE(C_LOOP)
 extern "C" void llint_entry(void*, void*);
 #endif
 
@@ -60,7 +60,7 @@
 #if ENABLE(C_LOOP)
     CLoop::initialize();
 
-#else // ENABLE(JIT)
+#else // !ENABLE(C_LOOP)
     llint_entry(&g_opcodeMap, &g_opcodeMapWide);
 
     for (int i = 0; i < numOpcodeIDs; ++i) {
@@ -71,7 +71,7 @@
     ASSERT(llint_throw_from_slow_path_trampoline < UINT8_MAX);
     for (int i = 0; i < maxOpcodeLength + 1; ++i)
         Data::s_exceptionInstructions[i] = llint_throw_from_slow_path_trampoline;
-#endif // ENABLE(JIT)
+#endif // ENABLE(C_LOOP)
 }
 
 IGNORE_CLANG_WARNINGS_BEGIN("missing-noreturn")
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to