[CFE] Don't issue an initialization error when trying to initialize when not having a platform

jensjoha · commit-bot@chromium.org · commit 878e2cacdd33 · 2020-07-06T07:40:00.000Z
This CL would have reduced the number of errors given in #42378 Namely the "Warning: Tried to initialize from a previous compilation (build/cache.dill), but couldn't." part wouldn't have been issued. Change-Id: I3e7f2f0115a13a23522643b6f4c9ad8c57bc0d5e Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/153141 Reviewed-by: Johnni Winther <johnniwinther@google.com> Commit-Queue: Jens Johansen <jensj@google.com>
diff --git a/pkg/front_end/lib/src/fasta/incremental_compiler.dart b/pkg/front_end/lib/src/fasta/incremental_compiler.dart
@@ -1438,9 +1438,9 @@ class IncrementalCompiler implements IncrementalKernelGenerator {
     dillLoadedData = new DillTarget(ticker, uriTranslator, c.options.target);
     int bytesLength = 0;
 
+    data.component = c.options.target.configureComponent(new Component());
     if (summaryBytes != null) {
       ticker.logMs("Read ${c.options.sdkSummary}");
-      data.component = c.options.target.configureComponent(new Component());
       new BinaryBuilderWithMetadata(summaryBytes,
               disableLazyReading: false, disableLazyClassReading: true)
           .readComponent(data.component);
diff --git a/pkg/front_end/test/incremental_load_from_dill_suite.dart b/pkg/front_end/test/incremental_load_from_dill_suite.dart
@@ -469,6 +469,9 @@ class NewWorldTest {
         options.fileSystem = fs;
         options.sdkRoot = null;
         options.sdkSummary = sdkSummaryUri;
+        if (world["badSdk"] == true) {
+          options.sdkSummary = sdkSummaryUri.resolve("nonexisting.dill");
+        }
         options.omitPlatform = omitPlatform != false;
         if (world["experiments"] != null) {
           Map<ExperimentalFlag, bool> experimentalFlags =
@@ -486,8 +489,12 @@ class NewWorldTest {
       final Set<String> formattedErrors = Set<String>();
       bool gotWarning = false;
       final Set<String> formattedWarnings = Set<String>();
+      final Set<String> seenDiagnosticCodes = Set<String>();
 
       options.onDiagnostic = (DiagnosticMessage message) {
+        String code = getMessageCodeObject(message)?.name;
+        if (code != null) seenDiagnosticCodes.add(code);
+
         String stringId = message.ansiFormatted.join("\n");
         if (message is FormattedMessage) {
           stringId = message.toJsonString();
@@ -581,6 +588,27 @@ class NewWorldTest {
       }
       performErrorAndWarningCheck(
           world, gotError, formattedErrors, gotWarning, formattedWarnings);
+      if (world["expectInitializationError"] != null) {
+        Set<String> seenInitializationError = seenDiagnosticCodes.intersection({
+          "InitializeFromDillNotSelfContainedNoDump",
+          "InitializeFromDillNotSelfContained",
+          "InitializeFromDillUnknownProblem",
+          "InitializeFromDillUnknownProblemNoDump",
+        });
+        if (world["expectInitializationError"] == true) {
+          if (seenInitializationError.isEmpty) {
+            throw "Expected to see an initialization error but didn't.";
+          }
+        } else if (world["expectInitializationError"] == false) {
+          if (seenInitializationError.isNotEmpty) {
+            throw "Expected not to see an initialization error but did: "
+                "$seenInitializationError.";
+          }
+        } else {
+          throw "Unsupported value for 'expectInitializationError': "
+              "${world["expectInitializationError"]}";
+        }
+      }
       util.throwOnEmptyMixinBodies(component);
       await util.throwOnInsufficientUriToSource(component,
           fileSystem: gotError ? null : fs);
@@ -1594,6 +1622,11 @@ class TestIncrementalCompiler extends IncrementalCompiler {
     }
     return result;
   }
+
+  void recordTemporaryFileForTesting(Uri uri) {
+    File f = new File.fromUri(uri);
+    if (f.existsSync()) f.deleteSync();
+  }
 }
 
 void doSimulateTransformer(Component c) {
diff --git a/pkg/front_end/test/incremental_utils.dart b/pkg/front_end/test/incremental_utils.dart
@@ -67,6 +67,7 @@ Future<void> throwOnInsufficientUriToSource(Component component,
   component.accept(uriFinder);
   Set<Uri> uris = uriFinder.seenUris.toSet();
   uris.removeAll(component.uriToSource.keys);
+  uris.remove(null);
   if (uris.length != 0) {
     throw "Expected 0 uris with no source, but found ${uris.length} ($uris)";
   }
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/bad_sdk_uri.yaml b/pkg/front_end/testcases/incremental_initialize_from_dill/bad_sdk_uri.yaml
@@ -0,0 +1,58 @@
+# Copyright (c) 2020, the Dart project authors. Please see the AUTHORS file
+# for details. All rights reserved. Use of this source code is governed by a
+# BSD-style license that can be found in the LICENSE.md file.
+
+# Give a bad SDK URI, and try to initialize from dill.
+
+type: newworld
+worlds:
+  - entry: main.dart
+    sources:
+      main.dart: |
+        import 'lib.dart';
+        class A extends B {}
+      lib.dart: |
+        class B {
+          void bMethod() {}
+        }
+    expectedLibraryCount: 2
+
+  - entry: main.dart
+    expectInitializeFromDill: true
+    invalidate:
+      - main.dart
+    sources:
+      main.dart: |
+        import 'lib.dart';
+        class A extends B {}
+      lib.dart: |
+        class B {
+          void bMethod() {}
+        }
+    expectedLibraryCount: 2
+
+  - entry: main.dart
+    badSdk: true
+    errors: true
+    expectInitializeFromDill: false
+    expectInitializationError: false
+
+    # this skips a check that fails (shouldn't matter considering this is an
+    # exceptional case).
+    checkInvalidatedFiles: false
+
+    # this skips re-compiling several times which fails to produce the same
+    # result (shouldn't matter considering this is an exceptional case).
+    noFullComponent: true
+
+    invalidate:
+      - main.dart
+    sources:
+      main.dart: |
+        import 'lib.dart';
+        class A extends B {}
+      lib.dart: |
+        class B {
+          void bMethod() {}
+        }
+    expectedLibraryCount: 2
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/bad_sdk_uri.yaml.world.1.expect b/pkg/front_end/testcases/incremental_initialize_from_dill/bad_sdk_uri.yaml.world.1.expect
@@ -0,0 +1,30 @@
+main = <No Member>;
+library from "org-dartlang-test:///lib.dart" as lib {
+
+  class B extends dart.core::Object {
+    synthetic constructor •() → lib::B*
+      : super dart.core::Object::•()
+      ;
+    method bMethod() → void {}
+    abstract member-signature get _identityHashCode() → dart.core::int*;
+    abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → dart.core::bool*;
+    abstract member-signature method _simpleInstanceOf(dynamic type) → dart.core::bool*;
+    abstract member-signature method _simpleInstanceOfTrue(dynamic type) → dart.core::bool*;
+    abstract member-signature method _simpleInstanceOfFalse(dynamic type) → dart.core::bool*;
+    abstract member-signature operator ==(dynamic other) → dart.core::bool*;
+    abstract member-signature get hashCode() → dart.core::int*;
+    abstract member-signature method toString() → dart.core::String*;
+    abstract member-signature method noSuchMethod(dart.core::Invocation* invocation) → dynamic;
+    abstract member-signature get runtimeType() → dart.core::Type*;
+  }
+}
+library from "org-dartlang-test:///main.dart" as main {
+
+  import "org-dartlang-test:///lib.dart";
+
+  class A extends lib::B {
+    synthetic constructor •() → main::A*
+      : super lib::B::•()
+      ;
+  }
+}
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/bad_sdk_uri.yaml.world.2.expect b/pkg/front_end/testcases/incremental_initialize_from_dill/bad_sdk_uri.yaml.world.2.expect
@@ -0,0 +1,30 @@
+main = <No Member>;
+library from "org-dartlang-test:///lib.dart" as lib {
+
+  class B extends dart.core::Object {
+    synthetic constructor •() → lib::B*
+      : super dart.core::Object::•()
+      ;
+    method bMethod() → void {}
+    abstract member-signature get _identityHashCode() → dart.core::int*;
+    abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → dart.core::bool*;
+    abstract member-signature method _simpleInstanceOf(dynamic type) → dart.core::bool*;
+    abstract member-signature method _simpleInstanceOfTrue(dynamic type) → dart.core::bool*;
+    abstract member-signature method _simpleInstanceOfFalse(dynamic type) → dart.core::bool*;
+    abstract member-signature operator ==(dynamic other) → dart.core::bool*;
+    abstract member-signature get hashCode() → dart.core::int*;
+    abstract member-signature method toString() → dart.core::String*;
+    abstract member-signature method noSuchMethod(dart.core::Invocation* invocation) → dynamic;
+    abstract member-signature get runtimeType() → dart.core::Type*;
+  }
+}
+library from "org-dartlang-test:///main.dart" as main {
+
+  import "org-dartlang-test:///lib.dart";
+
+  class A extends lib::B {
+    synthetic constructor •() → main::A*
+      : super lib::B::•()
+      ;
+  }
+}
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/bad_sdk_uri.yaml.world.3.expect b/pkg/front_end/testcases/incremental_initialize_from_dill/bad_sdk_uri.yaml.world.3.expect
@@ -0,0 +1,41 @@
+main = <No Member>;
+library from "org-dartlang-test:///lib.dart" as lib {
+
+  class B extends #lib1::Object {
+    synthetic constructor •() → lib::B*
+      : super #lib1::Object::•()
+      ;
+    method bMethod() → void {}
+    abstract member-signature operator ==(dynamic dynamic) → #lib1::bool*;
+  }
+}
+library from "org-dartlang-test:///main.dart" as main {
+
+  import "org-dartlang-test:///lib.dart";
+
+  class A extends lib::B {
+    synthetic constructor •() → main::A*
+      : super lib::B::•()
+      ;
+  }
+}
+
+And 18 platform libraries:
+ - dart:_builtin
+ - dart:_internal
+ - dart:_vmservice
+ - dart:async
+ - dart:cli
+ - dart:collection
+ - dart:convert
+ - dart:core
+ - dart:developer
+ - dart:ffi
+ - dart:io
+ - dart:isolate
+ - dart:math
+ - dart:mirrors
+ - dart:nativewrappers
+ - dart:typed_data
+ - dart:vmservice_io
+ - dart:wasm

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,7 @@ Future<void> throwOnInsufficientUriToSource(Component component,`
`67`	`67`	`component.accept(uriFinder);`
`68`	`68`	`Set<Uri> uris = uriFinder.seenUris.toSet();`
`69`	`69`	`uris.removeAll(component.uriToSource.keys);`
	`70`	`+ uris.remove(null);`
`70`	`71`	`if (uris.length != 0) {`
`71`	`72`	`throw "Expected 0 uris with no source, but found ${uris.length} ($uris)";`
`72`	`73`	`}`