Changeset 265159 in webkit

Timestamp:

Jul 31, 2020 2:02:16 PM (4 years ago)

Author:

keith_miller@apple.com

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):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• jsc.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2020-07-31  Keith Miller  <keith_miller@apple.com>
+
+        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  <sbarati@apple.com>
 

trunk/Source/JavaScriptCore/jsc.cpp

@@ -2676 +2676 @@
     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
@@ -3025 +3021 @@
     Options::initialize();
     
+#if PLATFORM(IOS_FAMILY)
+    Options::crashIfCantAllocateJITMemory() = true;
+#endif
+
     if (Options::dumpOptions()) {
         printf("Command line:");