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

Unified Diff: runtime/lib/isolate_patch.dart

Issue 2072873002: Fix for issue 26555, do not inherit package root and package config from the parent isolate when do… (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 years, 6 months 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 | « no previous file | tests/standalone/packages_file_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/lib/isolate_patch.dart
diff --git a/runtime/lib/isolate_patch.dart b/runtime/lib/isolate_patch.dart
index 09ae531fecd09a63a4ed8963c9c5b38f90a9a9ca..4dd89c0e7ca70bedc2d2d9f79cdd67c8bd777610 100644
--- a/runtime/lib/isolate_patch.dart
+++ b/runtime/lib/isolate_patch.dart
@@ -312,13 +312,12 @@ patch class Isolate {
try {
// The VM will invoke [_startIsolate] with entryPoint as argument.
readyPort = new RawReceivePort();
- var packageRoot = null;
- var packageConfig = null;
- if (Isolate._packageSupported()) {
- packageRoot = (await Isolate.packageRoot)?.toString();
- packageConfig = (await Isolate.packageConfig)?.toString();
- }
+ // We do not inherit the package root or package config settings
+ // from the parent isolate, instead we use the values that were
+ // set on the command line.
+ var packageRoot = VMLibraryHooks.packageRootString;
+ var packageConfig = VMLibraryHooks.packageConfigString;
var script = VMLibraryHooks.platformScript;
if (script == null) {
// We do not have enough information to support spawning the new
« no previous file with comments | « no previous file | tests/standalone/packages_file_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698