[vm/shared] Guard deferred-libraries and environment access from being used in isolate group bound dart code.

TEST=ffi/run_isolate_group_run_test
BUG=#61323
BUG=#61324

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

Author: aam

runtime/lib/isolate.cc

@@ -57,13 +57,6 @@ DEFINE_NATIVE_ENTRY(Capability_get_hashcode, 0, 1) {
   return Smi::New(hash);
 }
 
-static void ThrowCantRunWithoutIsolateError() {
-  const auto& error =
-      String::Handle(String::New("Only available when running in context of "
-                                 "an isolate, rather than isolate group."));
-  Exceptions::ThrowArgumentError(error);
-}
-
 DEFINE_NATIVE_ENTRY(RawReceivePort_factory, 0, 2) {
   ASSERT(
       TypeArguments::CheckedHandle(zone, arguments->NativeArgAt(0)).IsNull());

runtime/lib/object.cc

@@ -7,6 +7,7 @@
 #include "lib/invocation_mirror.h"
 #include "vm/bytecode_reader.h"
 #include "vm/code_patcher.h"
+#include "vm/dart_api_impl.h"
 #include "vm/dart_entry.h"
 #include "vm/exceptions.h"
 #include "vm/heap/heap.h"
@@ -247,12 +248,20 @@ DEFINE_NATIVE_ENTRY(Type_equality, 0, 2) {
 }
 
 DEFINE_NATIVE_ENTRY(LibraryPrefix_isLoaded, 0, 1) {
+  if (isolate == nullptr) {
+    ThrowCantRunWithoutIsolateError();
+    UNREACHABLE();
+  }
   const LibraryPrefix& prefix =
       LibraryPrefix::CheckedHandle(zone, arguments->NativeArgAt(0));
   return Bool::Get(isolate->IsPrefixLoaded(prefix)).ptr();
 }
 
 DEFINE_NATIVE_ENTRY(LibraryPrefix_setLoaded, 0, 1) {
+  if (isolate == nullptr) {
+    ThrowCantRunWithoutIsolateError();
+    UNREACHABLE();
+  }
   const LibraryPrefix& prefix =
       LibraryPrefix::CheckedHandle(zone, arguments->NativeArgAt(0));
   isolate->SetPrefixIsLoaded(prefix);

runtime/vm/dart_api_impl.cc

@@ -5344,6 +5344,10 @@ StringPtr Api::GetEnvironmentValue(Thread* thread, const String& name) {
 
 StringPtr Api::CallEnvironmentCallback(Thread* thread, const String& name) {
   Isolate* isolate = thread->isolate();
+  if (isolate == nullptr) {
+    ThrowCantRunWithoutIsolateError();
+    UNREACHABLE();
+  }
   Dart_EnvironmentCallback callback = isolate->environment_callback();
   if (callback != nullptr) {
     Scope api_scope(thread);
@@ -5372,7 +5376,10 @@ StringPtr Api::CallEnvironmentCallback(Thread* thread, const String& name) {
 DART_EXPORT Dart_Handle
 Dart_SetEnvironmentCallback(Dart_EnvironmentCallback callback) {
   Isolate* isolate = Isolate::Current();
-  CHECK_ISOLATE(isolate);
+  if (isolate == nullptr) {
+    ThrowCantRunWithoutIsolateError();
+    UNREACHABLE();
+  }
   isolate->set_environment_callback(callback);
   return Api::Success();
 }
@@ -5804,7 +5811,7 @@ static Dart_Handle LoadLibrary(Thread* T, const ExternalTypedData& td) {
       kernel::KernelLoader::LoadEntireProgram(program.get(), false);
   program.reset();
 
-  IsolateGroupSource* source = Isolate::Current()->source();
+  IsolateGroupSource* source = IsolateGroup::Current()->source();
   source->add_loaded_blob(Z, td);
 
   return Api::NewHandle(T, result.ptr());
@@ -7080,4 +7087,11 @@ DART_EXPORT char* Dart_WriteHeapSnapshot(
 #endif
 }
 
+void ThrowCantRunWithoutIsolateError() {
+  const auto& error =
+      String::Handle(String::New("Only available when running in context of "
+                                 "an isolate, rather than isolate group."));
+  Exceptions::ThrowArgumentError(error);
+}
+
 }  // namespace dart

runtime/vm/dart_api_impl.h

@@ -354,6 +354,8 @@ Isolate* CreateWithinExistingIsolateGroup(IsolateGroup* group,
                                           const char* name,
                                           char** error);
 
+void ThrowCantRunWithoutIsolateError();
+
 }  // namespace dart.
 
 #endif  // RUNTIME_VM_DART_API_IMPL_H_

tests/ffi/run_isolate_group_run_test.dart

@@ -17,6 +17,8 @@ import 'dart:isolate';
 
 import "package:expect/expect.dart";
 
+import "run_isolate_group_run_test.dart" deferred as lib1;
+
 var foo = 42;
 var foo_no_initializer;
 
@@ -74,6 +76,8 @@ ListMethodTearoffTest(List<String> args) {
   );
 }
 
+thefun() {}
+
 main(List<String> args) {
   IsolateGroup.runSync(() {
     final l = <int>[];
@@ -220,5 +224,19 @@ main(List<String> args) {
   );
   rp.close();
 
+  // deferred libraries can't be used from isolate group callbacks.
+  Expect.throws(() {
+    IsolateGroup.runSync(() {
+      lib1.thefun();
+    });
+  }, (e) => e is ArgumentError && e.toString().contains("Only available when"));
+
+  // environment can't be accessed from isolate group callbacks.
+  Expect.throws(() {
+    IsolateGroup.runSync(() {
+      new bool.hasEnvironment("Anything");
+    });
+  }, (e) => e is ArgumentError && e.toString().contains("Only available when"));
+
   print("All tests completed :)");
 }