[vm/concurrency] Change references to class_table/object_store/heap from Isolate to IsolateGroup

As part of making the compiler and other subsystems independent
of `Isolate` we have to move various state from `Isolate` to
`IsolateGroup`.

The class_table and object_store were already moved to `IsolateGroup`.

This CL only replaces usages of `Isolate::{object_store,class_table}`
with the equivalent in `IsolateGroup`.

Issue #36097

TEST=Pure refactoring - relying on existing test coverage.

Change-Id: I34a0682d715b054d6c5faff077a513980f59a348
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/177126
Commit-Queue: Martin Kustermann <[email protected]>
Reviewed-by: Alexander Aprelev <[email protected]>
Reviewed-by: Ryan Macnak <[email protected]>

Author: mkustermann

runtime/lib/ffi.cc

@@ -222,7 +222,7 @@ DEFINE_NATIVE_ENTRY(Ffi_asExternalTypedData, 0, 2) {
   }
 
   const auto& typed_data_class =
-      Class::Handle(zone, isolate->class_table()->At(cid));
+      Class::Handle(zone, isolate->group()->class_table()->At(cid));
   const auto& error =
       Error::Handle(zone, typed_data_class.EnsureIsAllocateFinalized(thread));
   if (!error.IsNull()) {

runtime/lib/isolate.cc

@@ -163,7 +163,7 @@ static ObjectPtr ValidateMessageObject(Zone* zone,
   if (!obj.raw()->IsHeapObject() || obj.raw()->ptr()->IsCanonical()) {
     return obj.raw();
   }
-  ClassTable* class_table = isolate->class_table();
+  ClassTable* class_table = isolate->group()->class_table();
 
   Class& klass = Class::Handle(zone);
   Closure& closure = Closure::Handle(zone);
@@ -457,7 +457,7 @@ IsolateSpawnState::~IsolateSpawnState() {
 
 ObjectPtr IsolateSpawnState::ResolveFunction() {
   Thread* thread = Thread::Current();
-  Isolate* I = thread->isolate();
+  auto IG = thread->isolate_group();
   Zone* zone = thread->zone();
 
   const String& func_name = String::Handle(zone, String::New(function_name()));
@@ -466,7 +466,7 @@ ObjectPtr IsolateSpawnState::ResolveFunction() {
     // Handle spawnUri lookup rules.
     // Check whether the root library defines a main function.
     const Library& lib =
-        Library::Handle(zone, I->object_store()->root_library());
+        Library::Handle(zone, IG->object_store()->root_library());
     Function& func = Function::Handle(zone, lib.LookupLocalFunction(func_name));
     if (func.IsNull()) {
       // Check whether main is reexported from the root library.
@@ -934,7 +934,7 @@ DEFINE_NATIVE_ENTRY(Isolate_spawnUri, 0, 12) {
 
   // Canonicalize the uri with respect to the current isolate.
   const Library& root_lib =
-      Library::Handle(isolate->object_store()->root_library());
+      Library::Handle(isolate->group()->object_store()->root_library());
   char* error = NULL;
   const char* canonical_uri = CanonicalizeUri(thread, root_lib, uri, &error);
   if (canonical_uri == NULL) {
@@ -988,7 +988,7 @@ DEFINE_NATIVE_ENTRY(Isolate_getPortAndCapabilitiesOfCurrentIsolate, 0, 0) {
 
 DEFINE_NATIVE_ENTRY(Isolate_getCurrentRootUriStr, 0, 0) {
   const Library& root_lib =
-      Library::Handle(zone, isolate->object_store()->root_library());
+      Library::Handle(zone, isolate->group()->object_store()->root_library());
   return root_lib.url();
 }
 
@@ -1071,8 +1071,8 @@ DEFINE_NATIVE_ENTRY(TransferableTypedData_factory, 0, 2) {
 
   uint8_t* data = reinterpret_cast<uint8_t*>(::malloc(total_bytes));
   if (data == nullptr) {
-    const Instance& exception =
-        Instance::Handle(thread->isolate()->object_store()->out_of_memory());
+    const Instance& exception = Instance::Handle(
+        thread->isolate_group()->object_store()->out_of_memory());
     Exceptions::Throw(thread, exception);
     UNREACHABLE();
   }
@@ -1122,7 +1122,7 @@ DEFINE_NATIVE_ENTRY(TransferableTypedData_materialize, 0, 1) {
   const ExternalTypedData& typed_data = ExternalTypedData::Handle(
       ExternalTypedData::New(kExternalTypedDataUint8ArrayCid, data, length,
                              thread->heap()->SpaceForExternal(length)));
-  FinalizablePersistentHandle::New(thread->isolate(), typed_data,
+  FinalizablePersistentHandle::New(thread->isolate_group(), typed_data,
                                    /* peer= */ data,
                                    &ExternalTypedDataFinalizer, length,
                                    /*auto_delete=*/true);

runtime/lib/mirrors.cc

@@ -585,8 +585,8 @@ static InstancePtr CreateIsolateMirror() {
   Thread* thread = Thread::Current();
   Isolate* isolate = thread->isolate();
   const String& debug_name = String::Handle(String::New(isolate->name()));
-  const Library& root_library =
-      Library::Handle(thread->zone(), isolate->object_store()->root_library());
+  const Library& root_library = Library::Handle(
+      thread->zone(), isolate->group()->object_store()->root_library());
   const Instance& root_library_mirror =
       Instance::Handle(CreateLibraryMirror(thread, root_library));
 
@@ -649,8 +649,8 @@ static AbstractTypePtr InstantiateType(const AbstractType& type,
 }
 
 DEFINE_NATIVE_ENTRY(MirrorSystem_libraries, 0, 0) {
-  const GrowableObjectArray& libraries =
-      GrowableObjectArray::Handle(zone, isolate->object_store()->libraries());
+  const GrowableObjectArray& libraries = GrowableObjectArray::Handle(
+      zone, isolate->group()->object_store()->libraries());
 
   const intptr_t num_libraries = libraries.Length();
   const GrowableObjectArray& library_mirrors = GrowableObjectArray::Handle(
@@ -696,11 +696,11 @@ DEFINE_NATIVE_ENTRY(IsolateMirror_loadUri, 0, 1) {
   } else {
     isolate->BlockClassFinalization();
     const Object& result = Object::Handle(
-        zone,
-        isolate->CallTagHandler(
-            Dart_kCanonicalizeUrl,
-            Library::Handle(zone, isolate->object_store()->root_library()),
-            uri));
+        zone, isolate->CallTagHandler(
+                  Dart_kCanonicalizeUrl,
+                  Library::Handle(
+                      zone, isolate->group()->object_store()->root_library()),
+                  uri));
     isolate->UnblockClassFinalization();
     if (result.IsError()) {
       if (result.IsLanguageError()) {
@@ -726,7 +726,8 @@ DEFINE_NATIVE_ENTRY(IsolateMirror_loadUri, 0, 1) {
   Object& result = Object::Handle(
       zone, isolate->CallTagHandler(
                 Dart_kImportTag,
-                Library::Handle(zone, isolate->object_store()->root_library()),
+                Library::Handle(
+                    zone, isolate->group()->object_store()->root_library()),
                 canonical_uri));
   isolate->UnblockClassFinalization();
   if (result.IsError()) {
@@ -1289,8 +1290,8 @@ DEFINE_NATIVE_ENTRY(ClosureMirror_function, 0, 1) {
       // The 'instantiator' created below should not be a type, but two type
       // argument vectors: instantiator_type_arguments and
       // function_type_arguments.
-      const Class& cls =
-          Class::Handle(Isolate::Current()->object_store()->object_class());
+      const Class& cls = Class::Handle(
+          IsolateGroup::Current()->object_store()->object_class());
       instantiator = Type::New(cls, arguments, TokenPosition::kNoSource);
       instantiator.SetIsFinalized();
     }

runtime/lib/object.cc

@@ -40,7 +40,7 @@ DEFINE_NATIVE_ENTRY(Object_getHash, 0, 1) {
 #if defined(HASH_IN_OBJECT_HEADER)
   return Smi::New(Object::GetCachedHash(arguments->NativeArgAt(0)));
 #else
-  Heap* heap = isolate->heap();
+  Heap* heap = isolate->group()->heap();
   ASSERT(arguments->NativeArgAt(0)->IsDartInstance());
   return Smi::New(heap->GetHash(arguments->NativeArgAt(0)));
 #endif
@@ -53,7 +53,7 @@ DEFINE_NATIVE_ENTRY(Object_setHash, 0, 2) {
 #else
   const Instance& instance =
       Instance::CheckedHandle(zone, arguments->NativeArgAt(0));
-  Heap* heap = isolate->heap();
+  Heap* heap = isolate->group()->heap();
   heap->SetHash(instance.raw(), hash.Value());
 #endif
   return Object::null();
@@ -221,7 +221,8 @@ DEFINE_NATIVE_ENTRY(LibraryPrefix_loadingUnit, 0, 1) {
 
 DEFINE_NATIVE_ENTRY(LibraryPrefix_issueLoad, 0, 1) {
   const Smi& id = Smi::CheckedHandle(zone, arguments->NativeArgAt(0));
-  Array& units = Array::Handle(zone, isolate->object_store()->loading_units());
+  Array& units =
+      Array::Handle(zone, isolate->group()->object_store()->loading_units());
   if (units.IsNull()) {
     // Not actually split.
     const Library& lib = Library::Handle(zone, Library::CoreLibrary());
@@ -259,7 +260,7 @@ DEFINE_NATIVE_ENTRY(Internal_reachabilityFence, 0, 1) {
 }
 
 DEFINE_NATIVE_ENTRY(Internal_collectAllGarbage, 0, 0) {
-  isolate->heap()->CollectAllGarbage();
+  isolate->group()->heap()->CollectAllGarbage();
   return Object::null();
 }
 

runtime/lib/string.cc

@@ -282,7 +282,7 @@ DEFINE_NATIVE_ENTRY(OneByteString_splitWithCharCode, 0, 2) {
                                           Heap::kNew);
   result.Add(str);
   result.SetTypeArguments(TypeArguments::Handle(
-      zone, isolate->object_store()->type_argument_string()));
+      zone, isolate->group()->object_store()->type_argument_string()));
   return result.raw();
 }
 
@@ -292,8 +292,8 @@ DEFINE_NATIVE_ENTRY(Internal_allocateOneByteString, 0, 1) {
   if ((length < 0) || (length > OneByteString::kMaxElements)) {
     // Assume that negative lengths are the result of wrapping in code in
     // string_patch.dart.
-    const Instance& exception =
-        Instance::Handle(thread->isolate()->object_store()->out_of_memory());
+    const Instance& exception = Instance::Handle(
+        thread->isolate_group()->object_store()->out_of_memory());
     Exceptions::Throw(thread, exception);
     UNREACHABLE();
   }
@@ -306,8 +306,8 @@ DEFINE_NATIVE_ENTRY(Internal_allocateTwoByteString, 0, 1) {
   if ((length < 0) || (length > TwoByteString::kMaxElements)) {
     // Assume that negative lengths are the result of wrapping in code in
     // string_patch.dart.
-    const Instance& exception =
-        Instance::Handle(thread->isolate()->object_store()->out_of_memory());
+    const Instance& exception = Instance::Handle(
+        thread->isolate_group()->object_store()->out_of_memory());
     Exceptions::Throw(thread, exception);
     UNREACHABLE();
   }

runtime/vm/bootstrap.cc

@@ -48,7 +48,7 @@ static void Finish(Thread* thread) {
   // Eagerly compile the _Closure class as it is the class of all closure
   // instances. This allows us to just finalize function types without going
   // through the hoops of trying to compile their scope class.
-  ObjectStore* object_store = thread->isolate()->object_store();
+  ObjectStore* object_store = thread->isolate_group()->object_store();
   Zone* zone = thread->zone();
   Class& cls = Class::Handle(zone, object_store->closure_class());
   cls.EnsureIsFinalized(thread);
@@ -111,7 +111,6 @@ static ErrorPtr BootstrapFromKernel(Thread* thread,
   if (setjmp(*jump.Set()) == 0) {
     kernel::KernelLoader loader(program.get(), /*uri_to_source_table=*/nullptr);
 
-    auto isolate = thread->isolate();
     auto isolate_group = thread->isolate_group();
 
     if (isolate_group->obfuscate()) {
@@ -122,7 +121,7 @@ static ErrorPtr BootstrapFromKernel(Thread* thread,
     Library& library = Library::Handle(zone);
     for (intptr_t i = 0; i < kBootstrapLibraryCount; ++i) {
       ObjectStore::BootstrapLibraryId id = bootstrap_libraries[i].index;
-      library = isolate->object_store()->bootstrap_library(id);
+      library = isolate_group->object_store()->bootstrap_library(id);
       loader.LoadLibrary(library);
     }
 
@@ -141,7 +140,7 @@ static ErrorPtr BootstrapFromKernel(Thread* thread,
     const auto& dart_builtin =
         String::Handle(zone, String::New("dart:_builtin"));
     library = Library::LookupLibrary(thread, dart_builtin);
-    isolate->object_store()->set_builtin_library(library);
+    isolate_group->object_store()->set_builtin_library(library);
 
     if (FLAG_precompiled_mode) {
       loader.ReadLoadingUnits();
@@ -158,7 +157,7 @@ static ErrorPtr BootstrapFromKernel(Thread* thread,
 ErrorPtr Bootstrap::DoBootstrapping(const uint8_t* kernel_buffer,
                                     intptr_t kernel_buffer_size) {
   Thread* thread = Thread::Current();
-  Isolate* isolate = thread->isolate();
+  auto isolate_group = thread->isolate_group();
   Zone* zone = thread->zone();
   String& uri = String::Handle(zone);
   Library& lib = Library::Handle(zone);
@@ -169,13 +168,13 @@ ErrorPtr Bootstrap::DoBootstrapping(const uint8_t* kernel_buffer,
   for (intptr_t i = 0; i < kBootstrapLibraryCount; ++i) {
     ObjectStore::BootstrapLibraryId id = bootstrap_libraries[i].index;
     uri = Symbols::New(thread, bootstrap_libraries[i].uri);
-    lib = isolate->object_store()->bootstrap_library(id);
+    lib = isolate_group->object_store()->bootstrap_library(id);
     ASSERT(lib.raw() == Library::LookupLibrary(thread, uri));
     if (lib.IsNull()) {
       lib = Library::NewLibraryHelper(uri, false);
       lib.SetLoadRequested();
       lib.Register(thread);
-      isolate->object_store()->set_bootstrap_library(id, lib);
+      isolate_group->object_store()->set_bootstrap_library(id, lib);
     }
   }