Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(583)

Unified Diff: runtime/bin/main.cc

Issue 2554953004: Revert "Add Kernel Isolate" (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/bin/loader.cc ('k') | runtime/include/dart_api.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/main.cc
diff --git a/runtime/bin/main.cc b/runtime/bin/main.cc
index 4c9182caa42a7206597bd4728678f4bb8fb34654..0adf4ac957f8fd899344dea432b59a09f37366df 100644
--- a/runtime/bin/main.cc
+++ b/runtime/bin/main.cc
@@ -61,10 +61,6 @@ enum SnapshotKind {
};
static SnapshotKind gen_snapshot_kind = kNone;
-static bool use_dart_frontend = false;
-
-static const char* frontend_filename = NULL;
-
// Value of the --package-root flag.
// (This pointer points into an argv buffer and does not need to be
// free'd.)
@@ -328,18 +324,6 @@ static bool ProcessParseAllOption(const char* arg,
}
-static bool ProcessFrontendOption(const char* filename,
- CommandLineOptions* vm_options) {
- ASSERT(filename != NULL);
- if (filename[0] == '\0') {
- return false;
- }
- use_dart_frontend = true;
- frontend_filename = filename;
- return true;
-}
-
-
static bool ProcessUseBlobsOption(const char* arg,
CommandLineOptions* vm_options) {
ASSERT(arg != NULL);
@@ -556,7 +540,6 @@ static struct {
// VM specific options to the standalone dart program.
{"--compile_all", ProcessCompileAllOption},
{"--parse_all", ProcessParseAllOption},
- {"--dfe=", ProcessFrontendOption},
{"--enable-vm-service", ProcessEnableVmServiceOption},
{"--disable-service-origin-check", ProcessDisableServiceOriginCheckOption},
{"--observe", ProcessObserveOption},
@@ -808,16 +791,6 @@ static Dart_Isolate CreateIsolateAndSetupHelper(const char* script_uri,
(strcmp(script_uri, DART_VM_SERVICE_ISOLATE_NAME) == 0)) {
return NULL;
}
- if (strcmp(script_uri, DART_KERNEL_ISOLATE_NAME) == 0) {
- if (!use_dart_frontend) {
- *error = strdup("Kernel isolate not supported.");
- return NULL;
- } else {
- if (packages_config == NULL) {
- packages_config = commandline_packages_file;
- }
- }
- }
// If the script is a Kernel binary, then we will try to bootstrap from the
// script.
@@ -897,10 +870,6 @@ static Dart_Isolate CreateIsolateAndSetupHelper(const char* script_uri,
CHECK_RESULT(result);
}
- if (Dart_IsKernelIsolate(isolate)) {
- script_uri = frontend_filename;
- }
-
// Setup package root if specified.
result = DartUtils::SetupPackageRoot(package_root, packages_config);
CHECK_RESULT(result);
@@ -908,17 +877,6 @@ static Dart_Isolate CreateIsolateAndSetupHelper(const char* script_uri,
result = Dart_SetEnvironmentCallback(EnvironmentCallback);
CHECK_RESULT(result);
- if (!Dart_IsKernelIsolate(isolate) && use_dart_frontend) {
- Log::PrintErr("Waiting for Kernel isolate to load.\n");
- // This must be the main script to be loaded. Wait for Kernel isolate
- // to finish initialization.
- Dart_Port port = Dart_ServiceWaitForKernelPort();
- if (port == ILLEGAL_PORT) {
- *error = strdup("Error while initializing Kernel isolate");
- return NULL;
- }
- }
-
if (run_app_snapshot) {
result = DartUtils::SetupIOLibrary(script_uri);
CHECK_RESULT(result);
« no previous file with comments | « runtime/bin/loader.cc ('k') | runtime/include/dart_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698