Title: [275383] branches/safari-612.1.8-branch/Source/_javascript_Core
- Revision
- 275383
- Author
- [email protected]
- Date
- 2021-04-01 14:23:58 -0700 (Thu, 01 Apr 2021)
Log Message
Cherry-pick r275374. rdar://problem/76111678
Remove use of ENABLE from API header
https://bugs.webkit.org/show_bug.cgi?id=224060
<rdar://76111678>
Reviewed by Mark Lam.
The use of the ENABLE macro in these API headers has caused build failures. Instead of
conditionally exposing these API methods we make them into no-ops if DFG is disabled.
* API/JSVirtualMachine.mm:
(+[JSVirtualMachine setNumberOfDFGCompilerThreads:]):
(+[JSVirtualMachine setNumberOfFTLCompilerThreads:]):
* API/JSVirtualMachinePrivate.h:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@275374 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-612.1.8-branch/Source/_javascript_Core/API/JSVirtualMachine.mm (275382 => 275383)
--- branches/safari-612.1.8-branch/Source/_javascript_Core/API/JSVirtualMachine.mm 2021-04-01 21:21:51 UTC (rev 275382)
+++ branches/safari-612.1.8-branch/Source/_javascript_Core/API/JSVirtualMachine.mm 2021-04-01 21:23:58 UTC (rev 275383)
@@ -272,28 +272,32 @@
vm->shrinkFootprintWhenIdle();
}
-#if ENABLE(DFG_JIT)
-
+ (NSUInteger)setNumberOfDFGCompilerThreads:(NSUInteger)numberOfThreads
{
+#if ENABLE(DFG_JIT)
JSC::DFG::Worklist* worklist = JSC::DFG::existingGlobalDFGWorklistOrNull();
if (worklist)
return worklist->setNumberOfThreads(numberOfThreads, JSC::Options::priorityDeltaOfDFGCompilerThreads());
else
return JSC::DFG::setNumberOfDFGCompilerThreads(numberOfThreads);
+#else
+ return 0;
+#endif // ENABLE(DFG_JIT)
}
+ (NSUInteger)setNumberOfFTLCompilerThreads:(NSUInteger)numberOfThreads
{
+#if ENABLE(DFG_JIT)
JSC::DFG::Worklist* worklist = JSC::DFG::existingGlobalFTLWorklistOrNull();
if (worklist)
return worklist->setNumberOfThreads(numberOfThreads, JSC::Options::priorityDeltaOfFTLCompilerThreads());
else
return JSC::DFG::setNumberOfFTLCompilerThreads(numberOfThreads);
+#else
+ return 0;
+#endif // ENABLE(DFG_JIT)
}
-#endif // ENABLE(DFG_JIT)
-
- (JSContextGroupRef)JSContextGroupRef
{
return m_group;
Modified: branches/safari-612.1.8-branch/Source/_javascript_Core/API/JSVirtualMachinePrivate.h (275382 => 275383)
--- branches/safari-612.1.8-branch/Source/_javascript_Core/API/JSVirtualMachinePrivate.h 2021-04-01 21:21:51 UTC (rev 275382)
+++ branches/safari-612.1.8-branch/Source/_javascript_Core/API/JSVirtualMachinePrivate.h 2021-04-01 21:23:58 UTC (rev 275383)
@@ -45,8 +45,6 @@
- (void)shrinkFootprintWhenIdle JSC_API_AVAILABLE(macos(10.14), ios(12.0));
-#if ENABLE(DFG_JIT)
-
/*!
@method
@abstract Set the number of threads to be used by the DFG JIT compiler.
@@ -80,8 +78,6 @@
*/
+ (void)setCrashOnVMCreation:(BOOL)shouldCrash;
-#endif // ENABLE(DFG_JIT)
-
@end
#endif // JSC_OBJC_API_ENABLED
Modified: branches/safari-612.1.8-branch/Source/_javascript_Core/ChangeLog (275382 => 275383)
--- branches/safari-612.1.8-branch/Source/_javascript_Core/ChangeLog 2021-04-01 21:21:51 UTC (rev 275382)
+++ branches/safari-612.1.8-branch/Source/_javascript_Core/ChangeLog 2021-04-01 21:23:58 UTC (rev 275383)
@@ -1,3 +1,40 @@
+2021-04-01 Russell Epstein <[email protected]>
+
+ Cherry-pick r275374. rdar://problem/76111678
+
+ Remove use of ENABLE from API header
+ https://bugs.webkit.org/show_bug.cgi?id=224060
+ <rdar://76111678>
+
+ Reviewed by Mark Lam.
+
+ The use of the ENABLE macro in these API headers has caused build failures. Instead of
+ conditionally exposing these API methods we make them into no-ops if DFG is disabled.
+
+ * API/JSVirtualMachine.mm:
+ (+[JSVirtualMachine setNumberOfDFGCompilerThreads:]):
+ (+[JSVirtualMachine setNumberOfFTLCompilerThreads:]):
+ * API/JSVirtualMachinePrivate.h:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@275374 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-04-01 Tadeu Zagallo <[email protected]>
+
+ Remove use of ENABLE from API header
+ https://bugs.webkit.org/show_bug.cgi?id=224060
+ <rdar://76111678>
+
+ Reviewed by Mark Lam.
+
+ The use of the ENABLE macro in these API headers has caused build failures. Instead of
+ conditionally exposing these API methods we make them into no-ops if DFG is disabled.
+
+ * API/JSVirtualMachine.mm:
+ (+[JSVirtualMachine setNumberOfDFGCompilerThreads:]):
+ (+[JSVirtualMachine setNumberOfFTLCompilerThreads:]):
+ * API/JSVirtualMachinePrivate.h:
+
2021-03-22 Michael Saboff <[email protected]>
[YARR] Interpreter incorrectly matches non-BMP characters with multiple .
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
