VM: Small clean up in main.cc after introducing dart_noopt.

runtime/bin/main.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 
 #include "include/dart_api.h"
 #include "include/dart_tools_api.h"
@@ skipping 62 matching lines @@
 
 // Value of the --gen/run_precompiled_snapshot flag.
 // (This pointer points into an argv buffer and does not need to be
 // free'd.)
 static const char* precompiled_snapshot_directory = NULL;
 
 
 // Global flag that is used to indicate that we want to compile everything in
 // the same way as precompilation before main, then continue running in the
 // same process.
-static bool has_noopt = false;
+// Always set this with dart_noopt.
+#if defined(DART_PRECOMPILER) && !defined(DART_NO_SNAPSHOT)
+static const bool has_noopt = true;
+#else
+static const bool has_noopt = false;
+#endif
 
 
 extern const char* kPrecompiledLibraryName;
 extern const char* kPrecompiledSymbolName;
 static const char* kPrecompiledVmIsolateName = "precompiled.vmisolate";
 static const char* kPrecompiledIsolateName = "precompiled.isolate";
 static const char* kPrecompiledInstructionsName = "precompiled.S";
 
 
 // Global flag that is used to indicate that we want to trace resolution of
@@ skipping 496 matching lines @@
 
   // Verify consistency of arguments.
   if ((commandline_package_root != NULL) &&
       (commandline_packages_file != NULL)) {
     Log::PrintErr("Specifying both a packages directory and a packages "
                   "file is invalid.\n");
     return -1;
   }
   if (has_noopt) {
     if (has_gen_precompiled_snapshot) {
-      Log::PrintErr("Specifying --noopt and --gen_precompiled_snapshot"
+      Log::PrintErr("Running dart_noopt with --gen_precompiled_snapshot"
                     " is invalid.\n");
       return -1;
     }
     if (has_run_precompiled_snapshot) {
-      Log::PrintErr("Specifying --noopt and --run_precompiled_snapshot"
+      Log::PrintErr("Running dart_noopt with --run_precompiled_snapshot"
                     " is invalid.\n");
       return -1;
     }
   }
   if (has_gen_precompiled_snapshot && has_run_precompiled_snapshot) {
     Log::PrintErr("Specifying --gen_precompiled_snapshot and"
                   " --run_precompiled_snapshot is invalid.\n");
     return -1;
   }
 
@@ skipping 822 matching lines @@
     fprintf(stderr, "Error determining current directory: %s\n", err.message());
     fflush(stderr);
     Platform::Exit(kErrorExitCode);
   }
 
   if (generate_script_snapshot) {
     vm_options.AddArgument("--load_deferred_eagerly");
   }
 
 #if defined(DART_PRECOMPILER) && !defined(DART_NO_SNAPSHOT)
-  // Always set --precompilation with dart_noopt, unless already set by these
-  // command line options.
-  if (!has_gen_precompiled_snapshot &&
-      !has_run_precompiled_snapshot) {
-    has_noopt = true;
-    vm_options.AddArgument("--precompilation");
-  }
+  // Always set --precompilation with dart_noopt.
+  ASSERT(!has_gen_precompiled_snapshot && !has_run_precompiled_snapshot);
+  vm_options.AddArgument("--precompilation");
 #endif
 
   Dart_SetVMFlags(vm_options.count(), vm_options.arguments());
 
   // Start event handler.
   TimerUtils::InitOnce();
   EventHandler::Start();
 
   const uint8_t* instructions_snapshot = NULL;
   if (has_run_precompiled_snapshot) {
@@ skipping 66 matching lines @@
   Platform::Exit(Process::GlobalExitCode());
 }
 
 }  // namespace bin
 }  // namespace dart
 
 int main(int argc, char** argv) {
   dart::bin::main(argc, argv);
   UNREACHABLE();
 }