diff --git a/runtime/bin/main_impl.cc b/runtime/bin/main_impl.cc index 4cd6fa46f20..6cdad039be5 100644 --- a/runtime/bin/main_impl.cc +++ b/runtime/bin/main_impl.cc @@ -759,14 +759,6 @@ static Dart_Isolate CreateIsolateGroupAndSetupHelper( } } - if (flags->copy_parent_code && callback_data != nullptr) { - auto parent_isolate_group_data = - reinterpret_cast(callback_data)->isolate_group_data(); - kernel_buffer_ptr = parent_isolate_group_data->kernel_buffer(); - kernel_buffer = kernel_buffer_ptr.get(); - kernel_buffer_size = parent_isolate_group_data->kernel_buffer_size(); - } - if (kernel_buffer == nullptr && !isolate_run_app_snapshot) { dfe.ReadScript(script_uri, app_snapshot, &kernel_buffer, &kernel_buffer_size, /*decode_uri=*/true, diff --git a/runtime/include/dart_api.h b/runtime/include/dart_api.h index 3ed71bdacec..8268aafec6b 100644 --- a/runtime/include/dart_api.h +++ b/runtime/include/dart_api.h @@ -589,7 +589,6 @@ typedef struct { bool use_osr; bool obfuscate; bool load_vmservice_library; - bool copy_parent_code; bool null_safety; bool is_system_isolate; bool is_service_isolate; diff --git a/runtime/lib/isolate.cc b/runtime/lib/isolate.cc index 25a5649e64c..463aa4b4e35 100644 --- a/runtime/lib/isolate.cc +++ b/runtime/lib/isolate.cc @@ -913,9 +913,6 @@ DEFINE_NATIVE_ENTRY(Isolate_spawnFunction, 0, 10) { paused.value(), fatal_errors, on_exit_port, on_error_port, utf8_debug_name, isolate->group())); - // Since this is a call to Isolate.spawn, copy the parent isolate's code. - state->isolate_flags()->copy_parent_code = true; - isolate->group()->thread_pool()->Run(isolate, std::move(state)); return Object::null(); @@ -1010,9 +1007,6 @@ DEFINE_NATIVE_ENTRY(Isolate_spawnUri, 0, 12) { flags->enable_asserts = checked.value(); } - // Since this is a call to Isolate.spawnUri, don't copy the parent's code. - state->isolate_flags()->copy_parent_code = false; - isolate->group()->thread_pool()->Run(isolate, std::move(state)); return Object::null(); diff --git a/runtime/vm/isolate.cc b/runtime/vm/isolate.cc index ba85b7a388f..bbcf8b33de4 100644 --- a/runtime/vm/isolate.cc +++ b/runtime/vm/isolate.cc @@ -1539,7 +1539,6 @@ void IsolateGroup::FlagsInitialize(Dart_IsolateFlags* api_flags) { api_flags->isolate_flag = flag; BOOL_ISOLATE_GROUP_FLAG_LIST(INIT_FROM_FLAG) #undef INIT_FROM_FLAG - api_flags->copy_parent_code = false; api_flags->is_service_isolate = false; api_flags->is_kernel_isolate = false; } @@ -1550,7 +1549,6 @@ void IsolateGroup::FlagsCopyTo(Dart_IsolateFlags* api_flags) { api_flags->isolate_flag = name(); BOOL_ISOLATE_GROUP_FLAG_LIST(INIT_FROM_FIELD) #undef INIT_FROM_FIELD - api_flags->copy_parent_code = false; api_flags->is_service_isolate = false; api_flags->is_kernel_isolate = false; } @@ -1592,7 +1590,6 @@ void Isolate::FlagsInitialize(Dart_IsolateFlags* api_flags) { api_flags->isolate_flag = flag; BOOL_ISOLATE_FLAG_LIST(INIT_FROM_FLAG) #undef INIT_FROM_FLAG - api_flags->copy_parent_code = false; api_flags->is_service_isolate = false; api_flags->is_kernel_isolate = false; } @@ -1605,13 +1602,11 @@ void Isolate::FlagsCopyTo(Dart_IsolateFlags* api_flags) const { api_flags->isolate_flag = name(); BOOL_ISOLATE_FLAG_LIST(INIT_FROM_FIELD) #undef INIT_FROM_FIELD - api_flags->copy_parent_code = false; api_flags->is_service_isolate = false; api_flags->is_kernel_isolate = false; } void Isolate::FlagsCopyFrom(const Dart_IsolateFlags& api_flags) { - const bool copy_parent_code_ = copy_parent_code(); #if defined(DART_PRECOMPILER) #define FLAG_FOR_PRECOMPILER(action) action #else @@ -1631,7 +1626,6 @@ void Isolate::FlagsCopyFrom(const Dart_IsolateFlags& api_flags) { api_flags.isolate_flag, isolate_flags_)); BOOL_ISOLATE_FLAG_LIST(SET_FROM_FLAG) - isolate_flags_ = CopyParentCodeBit::update(copy_parent_code_, isolate_flags_); #undef FLAG_FOR_NONPRODUCT #undef FLAG_FOR_PRECOMPILER #undef FLAG_FOR_PRODUCT diff --git a/runtime/vm/isolate.h b/runtime/vm/isolate.h index 579a6c17b57..04b48c17c77 100644 --- a/runtime/vm/isolate.h +++ b/runtime/vm/isolate.h @@ -155,7 +155,6 @@ typedef FixedCache CatchEntryMovesCache; FLAG_branch_coverage) #define BOOL_ISOLATE_FLAG_LIST_DEFAULT_GETTER(V) \ - V(PRODUCT, copy_parent_code, CopyParentCode, copy_parent_code, false) \ V(NONPRODUCT, is_system_isolate, IsSystemIsolate, is_system_isolate, false) \ V(NONPRODUCT, is_service_isolate, IsServiceIsolate, is_service_isolate, \ false) \ @@ -1567,7 +1566,6 @@ class Isolate : public BaseIsolate, public IntrusiveDListEntry { V(ResumeRequest) \ V(HasAttemptedStepping) \ V(ShouldPausePostServiceRequest) \ - V(CopyParentCode) \ V(IsSystemIsolate) \ V(IsServiceRegistered)