commit 544358304d9c49f739c9853256be5135811cdd9d
author asiva <asiva@google.com> Wed Jun 27 17:33:50 2018 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Wed Jun 27 17:33:50 2018 +0000
tree d5ac542ae583f0d785ec86fed593bba7174ccc31
parent e7da604c119967dce3a53e65df98ae97cfa33bed

[VM]
- Add --preview-dart-2 option back as a nop
- Temporarily treat --checked as an alias for --enable-asserts in Dart2
  mode so that google3 test scripts don't need to change.

Change-Id: I3a7d9f9e73d86bc8db247dfcb4e84440258949f6
Reviewed-on: https://dart-review.googlesource.com/62445
Reviewed-by: Zach Anderson <zra@google.com>
Reviewed-by: Keerti Parthasarathy <keertip@google.com>
Commit-Queue: Siva Annamalai <asiva@google.com>

runtime/bin/main_options.cc

diff --git a/runtime/bin/main_options.cc b/runtime/bin/main_options.cc
index e162713..cf88c86 100644
--- a/runtime/bin/main_options.cc
+++ b/runtime/bin/main_options.cc
@@ -356,7 +356,6 @@
       if ((strncmp(argv[i], kChecked, strlen(kChecked)) == 0) ||
           (strncmp(argv[i], kCheckedFull, strlen(kCheckedFull)) == 0)) {
         checked_set = true;
-        vm_options->AddArgument(kCheckedFull);
         i++;
         continue;  // '-c' is not a VM flag so don't add to vm options.
       } else if (!OptionProcessor::IsValidFlag(argv[i], kPrefix, kPrefixLen)) {
@@ -449,9 +448,11 @@
         " run using a snapshot is invalid.\n");
     return -1;
   }
-  if (checked_set && Options::preview_dart_2()) {
-    Log::PrintErr("Flags --checked and --preview-dart-2 are not compatible.\n");
-    return -1;
+  if (checked_set) {
+    vm_options->AddArgument("--enable-asserts");
+    if (Options::no_preview_dart_2()) {
+      vm_options->AddArgument("--enable-type-checks");
+    }
   }
 
   // If --snapshot is given without --snapshot-kind, default to script snapshot.

runtime/bin/main_options.h

diff --git a/runtime/bin/main_options.h b/runtime/bin/main_options.h
index 0592ffa..54ad3c8 100644
--- a/runtime/bin/main_options.h
+++ b/runtime/bin/main_options.h
@@ -43,7 +43,8 @@
   V(short_socket_read, short_socket_read)                                      \
   V(short_socket_write, short_socket_write)                                    \
   V(disable_exit, exit_disabled)                                               \
-  V(no_preview_dart_2, no_preview_dart_2)
+  V(no_preview_dart_2, no_preview_dart_2)                                      \
+  V(preview_dart_2, nop_option)
 
 // Boolean flags that have a short form.
 #define SHORT_BOOL_OPTIONS_LIST(V)                                             \