commit af45552aa541ff70a23290ea1555c0288966420f
author Ryan Macnak <rmacnak@google.com> Wed Aug 08 16:26:56 2018 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Wed Aug 08 16:26:56 2018 +0000
tree 7dfd73358ff63d032d88533964128bfeef376e72
parent 34f17b29735d5f8a9d3f6be7571edec379327a9f

[gen_snapshot] Remove --print_dependencies and --dependencies_only.

These options only make sense with a source input, which is not supported in Dart 2.

Change-Id: I7fcfecf44c310f49a688f189e77e8768cd82db23
Reviewed-on: https://dart-review.googlesource.com/65794
Reviewed-by: Zach Anderson <zra@google.com>
Reviewed-by: Siva Annamalai <asiva@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>

runtime/bin/gen_snapshot.cc

diff --git a/runtime/bin/gen_snapshot.cc b/runtime/bin/gen_snapshot.cc
index 67a5862..32c310e 100644
--- a/runtime/bin/gen_snapshot.cc
+++ b/runtime/bin/gen_snapshot.cc
@@ -154,8 +154,6 @@
   V(save_obfuscation_map, obfuscation_map_filename)
 
 #define BOOL_OPTIONS_LIST(V)                                                   \
-  V(dependencies_only, dependencies_only)                                      \
-  V(print_dependencies, print_dependencies)                                    \
   V(obfuscate, obfuscate)                                                      \
   V(verbose, verbose)                                                          \
   V(version, version)                                                          \
@@ -206,10 +204,6 @@
 "--dependencies=<output-file>                                                \n"
 "  Generates a Makefile with snapshot output files as targets and all        \n"
 "  transitive imports as sources.                                            \n"
-"--print_dependencies                                                        \n"
-"  Prints all transitive imports to stdout.                                  \n"
-"--dependencies_only                                                         \n"
-"  Don't create and output the snapshot.                                     \n"
 "--help                                                                      \n"
 "  Display this message (add --verbose for information about all VM options).\n"
 "--version                                                                   \n"
@@ -705,33 +699,12 @@
 
   Loader::ResolveDependenciesAsFilePaths();
 
-  ASSERT((dependencies_filename != NULL) || print_dependencies);
+  ASSERT(dependencies_filename != NULL);
   if (dependencies_filename != NULL) {
     DependenciesFileWriter writer;
     writer.WriteDependencies(dependencies);
   }
 
-  if (print_dependencies) {
-    Log::Print("%s\n", vm_snapshot_data_filename);
-    if (snapshot_kind == kScript) {
-      if (vm_snapshot_data_filename != NULL) {
-        Log::Print("%s\n", vm_snapshot_data_filename);
-      }
-      if (vm_snapshot_instructions_filename != NULL) {
-        Log::Print("%s\n", vm_snapshot_instructions_filename);
-      }
-      if (isolate_snapshot_data_filename != NULL) {
-        Log::Print("%s\n", isolate_snapshot_data_filename);
-      }
-      if (isolate_snapshot_instructions_filename != NULL) {
-        Log::Print("%s\n", isolate_snapshot_instructions_filename);
-      }
-    }
-    for (intptr_t i = 0; i < dependencies->length(); i++) {
-      Log::Print("%s\n", dependencies->At(i));
-    }
-  }
-
   for (intptr_t i = 0; i < dependencies->length(); i++) {
     free(dependencies->At(i));
   }
@@ -1422,7 +1395,7 @@
   char* error = NULL;
   IsolateData* isolate_data = new IsolateData(NULL, commandline_package_root,
                                               commandline_packages_file, NULL);
-  if ((dependencies_filename != NULL) || print_dependencies) {
+  if (dependencies_filename != NULL) {
     isolate_data->set_dependencies(new MallocGrowableArray<char*>());
   }
 
@@ -1552,8 +1525,7 @@
           "Can only generate core or aot snapshots from a kernel file.\n");
       return kErrorExitCode;
     }
-    if ((dependencies_filename != NULL) || print_dependencies ||
-        dependencies_only) {
+    if (dependencies_filename != NULL) {
       Log::PrintErr("Depfiles are not supported in Dart 2.\n");
       return kErrorExitCode;
     }
@@ -1718,7 +1690,7 @@
     // be in the snapshot.
     isolate_data = new IsolateData(app_script_name, commandline_package_root,
                                    commandline_packages_file, NULL);
-    if ((dependencies_filename != NULL) || print_dependencies) {
+    if (dependencies_filename != NULL) {
       isolate_data->set_dependencies(new MallocGrowableArray<char*>());
     }
 
@@ -1768,24 +1740,22 @@
 
     LoadCompilationTrace();
 
-    if (!dependencies_only) {
-      switch (snapshot_kind) {
-        case kCore:
-          CreateAndWriteCoreSnapshot();
-          break;
-        case kCoreJIT:
-          CreateAndWriteCoreJITSnapshot();
-          break;
-        case kScript:
-          CreateAndWriteScriptSnapshot();
-          break;
-        case kAppAOTBlobs:
-        case kAppAOTAssembly:
-          CreateAndWritePrecompiledSnapshot(entry_points);
-          break;
-        default:
-          UNREACHABLE();
-      }
+    switch (snapshot_kind) {
+      case kCore:
+        CreateAndWriteCoreSnapshot();
+        break;
+      case kCoreJIT:
+        CreateAndWriteCoreJITSnapshot();
+        break;
+      case kScript:
+        CreateAndWriteScriptSnapshot();
+        break;
+      case kAppAOTBlobs:
+      case kAppAOTAssembly:
+        CreateAndWritePrecompiledSnapshot(entry_points);
+        break;
+      default:
+        UNREACHABLE();
     }
 
     CreateAndWriteDependenciesFile();