Title: [265159] trunk/Source/_javascript_Core
Revision
265159
Author
[email protected]
Date
2020-07-31 14:02:16 -0700 (Fri, 31 Jul 2020)

Log Message

Move Options setter to where we allow access to the Options object
https://bugs.webkit.org/show_bug.cgi?id=215028

Reviewed by Saam Barati.

Right now jsc CLI crashes when assertions are enabled on iOS.

* jsc.cpp:
(main):
(CommandLine::parseArguments):

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (265158 => 265159)


--- trunk/Source/_javascript_Core/ChangeLog	2020-07-31 20:39:04 UTC (rev 265158)
+++ trunk/Source/_javascript_Core/ChangeLog	2020-07-31 21:02:16 UTC (rev 265159)
@@ -1,3 +1,16 @@
+2020-07-31  Keith Miller  <[email protected]>
+
+        Move Options setter to where we allow access to the Options object
+        https://bugs.webkit.org/show_bug.cgi?id=215028
+
+        Reviewed by Saam Barati.
+
+        Right now jsc CLI crashes when assertions are enabled on iOS.
+
+        * jsc.cpp:
+        (main):
+        (CommandLine::parseArguments):
+
 2020-07-31  Saam Barati  <[email protected]>
 
         Re-enable NO_SMT on Catalina

Modified: trunk/Source/_javascript_Core/jsc.cpp (265158 => 265159)


--- trunk/Source/_javascript_Core/jsc.cpp	2020-07-31 20:39:04 UTC (rev 265158)
+++ trunk/Source/_javascript_Core/jsc.cpp	2020-07-31 21:02:16 UTC (rev 265159)
@@ -2675,10 +2675,6 @@
     // have a chance to parse options.
     WTF::initialize();
 
-#if PLATFORM(IOS_FAMILY)
-    Options::crashIfCantAllocateJITMemory() = true;
-#endif
-
     // We can't use destructors in the following code because it uses Windows
     // Structured Exception Handling
     int res = EXIT_SUCCESS;
@@ -3024,6 +3020,10 @@
     Options::AllowUnfinalizedAccessScope scope;
     Options::initialize();
     
+#if PLATFORM(IOS_FAMILY)
+    Options::crashIfCantAllocateJITMemory() = true;
+#endif
+
     if (Options::dumpOptions()) {
         printf("Command line:");
 #if PLATFORM(COCOA)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to