[standalone] Remove code for --snapshot-kind=app-aot from main.cc.
This code was only used for dart_bootstrap, which has been removed.
Change-Id: I62f26a97058569724fdb2eb7344132a9e23b4207
Reviewed-on: https://dart-review.googlesource.com/c/78147
Reviewed-by: Siva Annamalai <asiva@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
diff --git a/runtime/bin/main.cc b/runtime/bin/main.cc
index 30d89d1..0843f44 100644
--- a/runtime/bin/main.cc
+++ b/runtime/bin/main.cc
@@ -34,9 +34,7 @@
#include "platform/growable_array.h"
#include "platform/hashmap.h"
#include "platform/text_buffer.h"
-#if !defined(DART_PRECOMPILER)
#include "bin/gzip.h"
-#endif
#include "vm/flags.h"
@@ -201,51 +199,6 @@
}
}
-static Dart_Isolate IsolateSetupHelperAotCompilationDart2(
- const char* script_uri,
- const char* main,
- const char* package_root,
- const char* packages_config,
- Dart_IsolateFlags* flags,
- char** error,
- int* exit_code) {
- uint8_t* payload = NULL;
- intptr_t payload_length = -1;
- if (File::GetType(NULL, script_uri, true) == File::kIsFile) {
- ReadFile(script_uri, &payload, &payload_length);
- }
- if (payload == NULL ||
- DartUtils::SniffForMagicNumber(payload, payload_length) !=
- DartUtils::kKernelMagicNumber) {
- FATAL1(
- "Dart 2.0 AOT compilations only accept Kernel IR files as "
- "input ('%s' is not a valid Kernel IR file).\n",
- script_uri);
- }
-
- auto isolate_data = new IsolateData(script_uri, NULL, NULL, NULL);
- // Kernel buffer released by ~IsolateData during isolate shutdown.
- isolate_data->set_kernel_buffer(payload, payload_length,
- true /*take ownership*/);
-
- // We bootstrap the isolate from the Kernel file (instead of using a
- // potentially linked-in kernel file).
- Dart_Isolate isolate = Dart_CreateIsolateFromKernel(
- script_uri, main, payload, payload_length, flags, isolate_data, error);
- if (isolate == NULL) {
- free(payload);
- return NULL;
- }
-
- Dart_EnterScope();
- Dart_Handle library = Dart_LoadScriptFromKernel(payload, payload_length);
- CHECK_RESULT(library);
- Dart_ExitScope();
- Dart_ExitIsolate();
-
- return isolate;
-}
-
static Dart_Isolate IsolateSetupHelper(Dart_Isolate isolate,
bool is_main_isolate,
const char* script_uri,
@@ -810,16 +763,6 @@
Process::GetRSSInformation(&(info->max_rss), &(info->current_rss));
}
-static void GenerateAppAOTSnapshot() {
- if (Options::use_blobs()) {
- Snapshot::GenerateAppAOTAsBlobs(Options::snapshot_filename(),
- app_isolate_shared_data,
- app_isolate_shared_instructions);
- } else {
- Snapshot::GenerateAppAOTAsAssembly(Options::snapshot_filename());
- }
-}
-
#define CHECK_RESULT(result) \
if (Dart_IsError(result)) { \
const int exit_code = Dart_IsCompilationError(result) \
@@ -854,10 +797,6 @@
file->Release();
}
-static Dart_QualifiedFunctionName standalone_entry_points[] = {
- {NULL, NULL, NULL} // Must be terminated with NULL entries.
-};
-
bool RunMainIsolate(const char* script_name, CommandLineOptions* dart_options) {
// Call CreateIsolateAndSetup which creates an isolate and loads up
// the specified application script.
@@ -868,21 +807,9 @@
Dart_IsolateFlags flags;
Dart_IsolateFlagsInitialize(&flags);
- if (Options::gen_snapshot_kind() == kAppAOT) {
- flags.obfuscate = Options::obfuscate();
- flags.entry_points = standalone_entry_points;
- }
-
- Dart_Isolate isolate = NULL;
- if (Options::gen_snapshot_kind() == kAppAOT) {
- isolate = IsolateSetupHelperAotCompilationDart2(
- script_name, "main", Options::package_root(), Options::packages_file(),
- &flags, &error, &exit_code);
- } else {
- isolate = CreateIsolateAndSetupHelper(
- is_main_isolate, script_name, "main", Options::package_root(),
- Options::packages_file(), &flags, &error, &exit_code);
- }
+ Dart_Isolate isolate = CreateIsolateAndSetupHelper(
+ is_main_isolate, script_name, "main", Options::package_root(),
+ Options::packages_file(), &flags, &error, &exit_code);
if (isolate == NULL) {
delete[] isolate_name;
@@ -927,17 +854,8 @@
// lookup the main entry point exported from the root library.
result = Dart_LibraryImportLibrary(DartUtils::LookupBuiltinLib(), root_lib,
Dart_Null());
-#if !defined(DART_PRECOMPILED_RUNTIME)
- if (Options::gen_snapshot_kind() == kAppAOT) {
- // Load the embedder's portion of the VM service's Dart code so it will
- // be included in the app snapshot.
- if (!VmService::LoadForGenPrecompiled(dfe.UseDartFrontend())) {
- Log::PrintErr("VM service loading failed: %s\n",
- VmService::GetErrorMessage());
- Platform::Exit(kErrorExitCode);
- }
- }
+#if !defined(DART_PRECOMPILED_RUNTIME)
if (Options::compile_all()) {
result = Dart_CompileAll();
CHECK_RESULT(result);
@@ -951,86 +869,68 @@
Dart_ShutdownIsolate();
return false;
}
-
- if (Options::gen_snapshot_kind() == kAppAOT) {
- result = Dart_Precompile();
- CHECK_RESULT(result);
-
- if (Options::obfuscate() &&
- (Options::obfuscation_map_filename() != NULL)) {
- uint8_t* buffer = NULL;
- intptr_t size = 0;
- result = Dart_GetObfuscationMap(&buffer, &size);
- CHECK_RESULT(result);
- WriteFile(Options::obfuscation_map_filename(), buffer, size);
- }
- }
#endif // !defined(DART_PRECOMPILED_RUNTIME)
- if (Options::gen_snapshot_kind() == kAppAOT) {
- GenerateAppAOTSnapshot();
- } else {
- if (Dart_IsNull(root_lib)) {
- ErrorExit(kErrorExitCode, "Unable to find root library for '%s'\n",
- script_name);
- }
+ if (Dart_IsNull(root_lib)) {
+ ErrorExit(kErrorExitCode, "Unable to find root library for '%s'\n",
+ script_name);
+ }
- if (Options::gen_snapshot_kind() == kAppJIT) {
- result = Dart_SortClasses();
- CHECK_RESULT(result);
- }
-
- if (Options::load_compilation_trace_filename() != NULL) {
- uint8_t* buffer = NULL;
- intptr_t size = 0;
- ReadFile(Options::load_compilation_trace_filename(), &buffer, &size);
- result = Dart_LoadCompilationTrace(buffer, size);
- CHECK_RESULT(result);
- }
-
- // Create a closure for the main entry point which is in the exported
- // namespace of the root library or invoke a getter of the same name
- // in the exported namespace and return the resulting closure.
- Dart_Handle main_closure =
- Dart_GetField(root_lib, Dart_NewStringFromCString("main"));
- CHECK_RESULT(main_closure);
- if (!Dart_IsClosure(main_closure)) {
- ErrorExit(kErrorExitCode,
- "Unable to find 'main' in root library '%s'\n", script_name);
- }
-
- // Call _startIsolate in the isolate library to enable dispatching the
- // initial startup message.
- const intptr_t kNumIsolateArgs = 2;
- Dart_Handle isolate_args[kNumIsolateArgs];
- isolate_args[0] = main_closure; // entryPoint
- isolate_args[1] = CreateRuntimeOptions(dart_options); // args
-
- Dart_Handle isolate_lib =
- Dart_LookupLibrary(Dart_NewStringFromCString("dart:isolate"));
- result = Dart_Invoke(isolate_lib,
- Dart_NewStringFromCString("_startMainIsolate"),
- kNumIsolateArgs, isolate_args);
+ if (Options::gen_snapshot_kind() == kAppJIT) {
+ result = Dart_SortClasses();
CHECK_RESULT(result);
+ }
- // Keep handling messages until the last active receive port is closed.
- result = Dart_RunLoop();
- // Generate an app snapshot after execution if specified.
- if (Options::gen_snapshot_kind() == kAppJIT) {
- if (!Dart_IsCompilationError(result)) {
- Snapshot::GenerateAppJIT(Options::snapshot_filename());
- }
- }
+ if (Options::load_compilation_trace_filename() != NULL) {
+ uint8_t* buffer = NULL;
+ intptr_t size = 0;
+ ReadFile(Options::load_compilation_trace_filename(), &buffer, &size);
+ result = Dart_LoadCompilationTrace(buffer, size);
CHECK_RESULT(result);
+ }
- if (Options::save_compilation_trace_filename() != NULL) {
- uint8_t* buffer = NULL;
- intptr_t size = 0;
- result = Dart_SaveCompilationTrace(&buffer, &size);
- CHECK_RESULT(result);
- WriteFile(Options::save_compilation_trace_filename(), buffer, size);
+ // Create a closure for the main entry point which is in the exported
+ // namespace of the root library or invoke a getter of the same name
+ // in the exported namespace and return the resulting closure.
+ Dart_Handle main_closure =
+ Dart_GetField(root_lib, Dart_NewStringFromCString("main"));
+ CHECK_RESULT(main_closure);
+ if (!Dart_IsClosure(main_closure)) {
+ ErrorExit(kErrorExitCode, "Unable to find 'main' in root library '%s'\n",
+ script_name);
+ }
+
+ // Call _startIsolate in the isolate library to enable dispatching the
+ // initial startup message.
+ const intptr_t kNumIsolateArgs = 2;
+ Dart_Handle isolate_args[kNumIsolateArgs];
+ isolate_args[0] = main_closure; // entryPoint
+ isolate_args[1] = CreateRuntimeOptions(dart_options); // args
+
+ Dart_Handle isolate_lib =
+ Dart_LookupLibrary(Dart_NewStringFromCString("dart:isolate"));
+ result =
+ Dart_Invoke(isolate_lib, Dart_NewStringFromCString("_startMainIsolate"),
+ kNumIsolateArgs, isolate_args);
+ CHECK_RESULT(result);
+
+ // Keep handling messages until the last active receive port is closed.
+ result = Dart_RunLoop();
+ // Generate an app snapshot after execution if specified.
+ if (Options::gen_snapshot_kind() == kAppJIT) {
+ if (!Dart_IsCompilationError(result)) {
+ Snapshot::GenerateAppJIT(Options::snapshot_filename());
}
}
+ CHECK_RESULT(result);
+
+ if (Options::save_compilation_trace_filename() != NULL) {
+ uint8_t* buffer = NULL;
+ intptr_t size = 0;
+ result = Dart_SaveCompilationTrace(&buffer, &size);
+ CHECK_RESULT(result);
+ WriteFile(Options::save_compilation_trace_filename(), buffer, size);
+ }
}
WriteDepsFile(isolate);
@@ -1047,7 +947,7 @@
#undef CHECK_RESULT
// Observatory assets are only needed in the regular dart binary.
-#if !defined(DART_PRECOMPILER) && !defined(NO_OBSERVATORY)
+#if !defined(NO_OBSERVATORY)
extern unsigned int observatory_assets_archive_len;
extern const uint8_t* observatory_assets_archive;
@@ -1063,9 +963,9 @@
free(decompressed);
return tar_file;
}
-#else // !defined(DART_PRECOMPILER)
+#else // !defined(NO_OBSERVATORY)
static Dart_GetVMServiceAssetsArchive GetVMServiceAssetsArchiveCallback = NULL;
-#endif // !defined(DART_PRECOMPILER)
+#endif // !defined(NO_OBSERVATORY)
void main(int argc, char** argv) {
char* script_name;
@@ -1174,9 +1074,6 @@
vm_options.AddArgument("--collect_code=false");
#endif
}
- if (Options::gen_snapshot_kind() == kAppAOT) {
- vm_options.AddArgument("--precompilation");
- }
#if defined(DART_PRECOMPILED_RUNTIME)
vm_options.AddArgument("--precompilation");
#endif
diff --git a/runtime/bin/main_options.cc b/runtime/bin/main_options.cc
index bbaeaad..a7181f5 100644
--- a/runtime/bin/main_options.cc
+++ b/runtime/bin/main_options.cc
@@ -25,7 +25,10 @@
// These strings must match the enum SnapshotKind in main_options.h.
static const char* kSnapshotKindNames[] = {
- "none", "kernel", "app-aot", "app-jit", NULL,
+ "none",
+ "kernel",
+ "app-jit",
+ NULL,
};
SnapshotKind Options::gen_snapshot_kind_ = kNone;
@@ -147,7 +150,7 @@
" These snapshot options are used to generate a snapshot of the loaded\n"
" Dart script:\n"
" <snapshot-kind> controls the kind of snapshot, it could be\n"
-" script(default), app-aot or app-jit\n"
+" kernel(default) or app-jit\n"
" <file_name> specifies the file into which the snapshot is written\n"
"--version\n"
" Print the VM version.\n");
@@ -178,7 +181,7 @@
" These snapshot options are used to generate a snapshot of the loaded\n"
" Dart script:\n"
" <snapshot-kind> controls the kind of snapshot, it could be\n"
-" script(default), app-aot or app-jit\n"
+" kernel(default) or app-jit\n"
" <file_name> specifies the file into which the snapshot is written\n"
"--version\n"
" Print the VM version.\n"
diff --git a/runtime/bin/main_options.h b/runtime/bin/main_options.h
index eebc9ed..057cfed 100644
--- a/runtime/bin/main_options.h
+++ b/runtime/bin/main_options.h
@@ -24,7 +24,6 @@
V(depfile, depfile) \
V(depfile_output_filename, depfile_output_filename) \
V(shared_blobs, shared_blobs_filename) \
- V(save_obfuscation_map, obfuscation_map_filename) \
V(save_compilation_trace, save_compilation_trace_filename) \
V(load_compilation_trace, load_compilation_trace_filename) \
V(root_certs_file, root_certs_file) \
@@ -39,8 +38,6 @@
V(parse_all, parse_all) \
V(disable_service_origin_check, vm_service_dev_mode) \
V(deterministic, deterministic) \
- V(use_blobs, use_blobs) \
- V(obfuscate, obfuscate) \
V(trace_loading, trace_loading) \
V(short_socket_read, short_socket_read) \
V(short_socket_write, short_socket_write) \
@@ -69,7 +66,6 @@
enum SnapshotKind {
kNone,
kKernel,
- kAppAOT,
kAppJIT,
};
