[vm] Remove IsolateSpawnState::package_root
Change-Id: I5a35f0e3c233353eafcb4e772abeeb6abc11daba
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/101626
Reviewed-by: Ryan Macnak <rmacnak@google.com>
Commit-Queue: Matthew Dempsky <mdempsky@google.com>
diff --git a/runtime/lib/isolate.cc b/runtime/lib/isolate.cc
index d666686..aed9937 100644
--- a/runtime/lib/isolate.cc
+++ b/runtime/lib/isolate.cc
@@ -135,8 +135,8 @@
ASSERT(name != NULL);
Isolate* isolate = reinterpret_cast<Isolate*>((callback)(
- state_->script_url(), name, state_->package_root(),
- state_->package_config(), &api_flags, state_->init_data(), &error));
+ state_->script_url(), name, nullptr, state_->package_config(),
+ &api_flags, state_->init_data(), &error));
state_->DecrementSpawnCount();
if (isolate == NULL) {
ReportError(error);
@@ -223,8 +223,6 @@
message, ILLEGAL_PORT, Message::kNormalPriority));
}
- // TODO(mfairhurst) remove package_root, as it no longer does anything.
- const char* utf8_package_root = NULL;
const char* utf8_package_config =
packageConfig.IsNull() ? NULL : String2UTF8(packageConfig);
const char* utf8_debug_name =
@@ -234,8 +232,8 @@
port.Id(), isolate->origin_id(), isolate->init_callback_data(),
String2UTF8(script_uri), func, &message_buffer,
isolate->spawn_count_monitor(), isolate->spawn_count(),
- utf8_package_root, utf8_package_config, paused.value(), fatal_errors,
- on_exit_port, on_error_port, utf8_debug_name);
+ utf8_package_config, paused.value(), fatal_errors, on_exit_port,
+ on_error_port, utf8_debug_name);
// Since this is a call to Isolate.spawn, copy the parent isolate's code.
state->isolate_flags()->copy_parent_code = true;
@@ -351,8 +349,6 @@
ThrowIsolateSpawnException(msg);
}
- // TODO(mfairhurst) remove package_root, as it no longer does anything.
- const char* utf8_package_root = NULL;
const char* utf8_package_config =
packageConfig.IsNull() ? NULL : String2UTF8(packageConfig);
const char* utf8_debug_name =
@@ -360,10 +356,9 @@
IsolateSpawnState* state = new IsolateSpawnState(
port.Id(), isolate->init_callback_data(), canonical_uri,
- utf8_package_root, utf8_package_config, &arguments_buffer,
- &message_buffer, isolate->spawn_count_monitor(), isolate->spawn_count(),
- paused.value(), fatal_errors, on_exit_port, on_error_port,
- utf8_debug_name);
+ utf8_package_config, &arguments_buffer, &message_buffer,
+ isolate->spawn_count_monitor(), isolate->spawn_count(), paused.value(),
+ fatal_errors, on_exit_port, on_error_port, utf8_debug_name);
// If we were passed a value then override the default flags state for
// checked mode.
diff --git a/runtime/vm/isolate.cc b/runtime/vm/isolate.cc
index 49810ef..5aa112d 100644
--- a/runtime/vm/isolate.cc
+++ b/runtime/vm/isolate.cc
@@ -2930,7 +2930,6 @@
SerializedObjectBuffer* message_buffer,
Monitor* spawn_count_monitor,
intptr_t* spawn_count,
- const char* package_root,
const char* package_config,
bool paused,
bool errors_are_fatal,
@@ -2944,7 +2943,6 @@
on_exit_port_(on_exit_port),
on_error_port_(on_error_port),
script_url_(script_url),
- package_root_(package_root),
package_config_(package_config),
library_url_(nullptr),
class_name_(nullptr),
@@ -2977,7 +2975,6 @@
IsolateSpawnState::IsolateSpawnState(Dart_Port parent_port,
void* init_data,
const char* script_url,
- const char* package_root,
const char* package_config,
SerializedObjectBuffer* args_buffer,
SerializedObjectBuffer* message_buffer,
@@ -2995,7 +2992,6 @@
on_exit_port_(on_exit_port),
on_error_port_(on_error_port),
script_url_(script_url),
- package_root_(package_root),
package_config_(package_config),
library_url_(nullptr),
class_name_(nullptr),
@@ -3017,7 +3013,6 @@
IsolateSpawnState::~IsolateSpawnState() {
delete[] script_url_;
- delete[] package_root_;
delete[] package_config_;
delete[] library_url_;
delete[] class_name_;
diff --git a/runtime/vm/isolate.h b/runtime/vm/isolate.h
index 142a87f..4535961 100644
--- a/runtime/vm/isolate.h
+++ b/runtime/vm/isolate.h
@@ -1160,7 +1160,6 @@
SerializedObjectBuffer* message_buffer,
Monitor* spawn_count_monitor,
intptr_t* spawn_count,
- const char* package_root,
const char* package_config,
bool paused,
bool errorsAreFatal,
@@ -1170,7 +1169,6 @@
IsolateSpawnState(Dart_Port parent_port,
void* init_data,
const char* script_url,
- const char* package_root,
const char* package_config,
SerializedObjectBuffer* args_buffer,
SerializedObjectBuffer* message_buffer,
@@ -1192,7 +1190,6 @@
Dart_Port on_exit_port() const { return on_exit_port_; }
Dart_Port on_error_port() const { return on_error_port_; }
const char* script_url() const { return script_url_; }
- const char* package_root() const { return package_root_; }
const char* package_config() const { return package_config_; }
const char* library_url() const { return library_url_; }
const char* class_name() const { return class_name_; }
@@ -1217,7 +1214,6 @@
Dart_Port on_exit_port_;
Dart_Port on_error_port_;
const char* script_url_;
- const char* package_root_;
const char* package_config_;
const char* library_url_;
const char* class_name_;
