Changeset 43960 in webkit

Timestamp:

May 20, 2009 10:52:44 PM (15 years ago)

Author:

weinig@apple.com

Message:

2009-05-20 Sam Weinig <​sam@webkit.org>

Reviewed by Cameron Zwarich.

Cleanup the JSGlobalData when exiting early with the usage statement in jsc.

• jsc.cpp: (printUsageStatement): (parseArguments): (jscmain):

Location:

trunk/JavaScriptCore

Files:

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

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2009-05-20  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Cameron Zwarich.
+
+        Cleanup the JSGlobalData when exiting early with the usage statement in jsc.
+
+        * jsc.cpp:
+        (printUsageStatement):
+        (parseArguments):
+        (jscmain):
+
 2009-05-20  Stephanie Lewis  <slewis@apple.com>
 

trunk/JavaScriptCore/jsc.cpp

@@ -464 +464 @@
 }
 
-static NO_RETURN void printUsageStatement(bool help = false)
+static NO_RETURN void printUsageStatement(JSGlobalData* globalData, bool help = false)
 {
     fprintf(stderr, "Usage: jsc [options] [files] [-- arguments]\n");
@@ -473 +473 @@
     fprintf(stderr, "  -i         Enables interactive mode (default if no files are specified)\n");
     fprintf(stderr, "  -s         Installs signal handlers that exit on a crash (Unix platforms only)\n");
+
+    cleanupGlobalData(globalData);
     exit(help ? EXIT_SUCCESS : EXIT_FAILURE);
 }
 
-static void parseArguments(int argc, char** argv, Options& options)
+static void parseArguments(int argc, char** argv, Options& options, JSGlobalData* globalData)
 {
     int i = 1;
@@ -483 +485 @@
         if (strcmp(arg, "-f") == 0) {
             if (++i == argc)
-                printUsageStatement();
+                printUsageStatement(globalData);
             options.scripts.append(Script(true, argv[i]));
             continue;
@@ -489 +491 @@
         if (strcmp(arg, "-e") == 0) {
             if (++i == argc)
-                printUsageStatement();
+                printUsageStatement(globalData);
             options.scripts.append(Script(false, argv[i]));
             continue;
         }
         if (strcmp(arg, "-h") == 0 || strcmp(arg, "--help") == 0) {
-            printUsageStatement(true);
+            printUsageStatement(globalData, true);
         }
         if (strcmp(arg, "-i") == 0) {
@@ -532 +534 @@
 
     Options options;
-    parseArguments(argc, argv, options);
+    parseArguments(argc, argv, options, globalData);
 
     GlobalObject* globalObject = new (globalData) GlobalObject(options.arguments);