[cfe,vm] Make patch parts into actual parts

This changes the VM patch files to use parts explicitly, making
handling of patch libraries similar to regular libraries.

Cq-Include-Trybots: luci.dart.try:dart2wasm-linux-x64-d8-try

Change-Id: I6280d62edba3d12a1f77ae6a7f64e1e9b5d18227
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/224949
Reviewed-by: Aske Simon Christensen <[email protected]>
Reviewed-by: Alexander Markov <[email protected]>
Commit-Queue: Johnni Winther <[email protected]>

Author: johnniwinther

pkg/front_end/lib/src/fasta/kernel/kernel_target.dart

@@ -1708,24 +1708,11 @@ class KernelTarget extends TargetImplementation {
     assert(library.importUri.isScheme("dart"));
     List<Uri>? patches = uriTranslator.getDartPatches(library.importUri.path);
     if (patches != null) {
-      SourceLibraryBuilder? first;
       for (Uri patch in patches) {
-        if (first == null) {
-          first = library.loader.read(patch, -1,
-              fileUri: patch,
-              origin: library,
-              accessor: library) as SourceLibraryBuilder;
-        } else {
-          // If there's more than one patch file, it's interpreted as a part of
-          // the patch library.
-          SourceLibraryBuilder part = library.loader.read(patch, -1,
-              origin: library,
-              fileUri: patch,
-              accessor: library) as SourceLibraryBuilder;
-          first.parts.add(part);
-          first.partOffsets.add(-1);
-          part.partOfUri = first.importUri;
-        }
+        library.loader.read(patch, -1,
+            fileUri: patch,
+            origin: library,
+            accessor: library) as SourceLibraryBuilder;
       }
     }
   }

pkg/front_end/lib/src/fasta/source/source_library_builder.dart

@@ -799,7 +799,7 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
     // TODO(johnniwinther): Add a LibraryPartBuilder instead of using
     // [LibraryBuilder] to represent both libraries and parts.
     parts.add(loader.read(resolvedUri, charOffset,
-        fileUri: newFileUri, accessor: this));
+        origin: isPatch ? origin : null, fileUri: newFileUri, accessor: this));
     partOffsets.add(charOffset);
 
     // TODO(ahe): [metadata] should be stored, evaluated, and added to [part].

pkg/front_end/testcases/general/multiple_class_patches/main.dart.weak.expect

@@ -18,16 +18,6 @@ static method expect(dynamic expected, dynamic actual) → dynamic {
 }
 
 library /*isNonNullableByDefault*/;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general/multiple_class_patches/patch_lib2.dart:9:7: Error: 'Class' is already declared in this scope.
-// class Class {
-//       ^^^^^
-// pkg/front_end/testcases/general/multiple_class_patches/patch_lib1.dart:9:7: Context: Previous declaration of 'Class'.
-// class Class {
-//       ^^^^^
-//
 import self as test;
 import "dart:_internal" as _in;
 import "dart:core" as core;
@@ -36,17 +26,6 @@ import "dart:_internal";
 import "dart:_internal";
 
 @#C1
-class Class#1#1 extends core::Object { // from org-dartlang-testcase:///patch_lib2.dart
-  synthetic constructor •() → test::Class#1#1
-    : super core::Object::•()
-    ;
-  @#C1
-  method method2() → core::int
-    return 87;
-  @#C1
-  method method3() → core::int
-    return 123;
-}
 @#C1
 class Class extends core::Object {
   synthetic constructor •() → test::Class
@@ -55,10 +34,13 @@ class Class extends core::Object {
   @#C1
   method /* from org-dartlang-testcase:///patch_lib1.dart */ method1() → core::int
     return 42;
-  external method method2() → core::int;
   @#C1
-  method /* from org-dartlang-testcase:///patch_lib1.dart */ method3() → core::int
-    return 321;
+  method /* from org-dartlang-testcase:///patch_lib2.dart */ method2() → core::int
+    return 87;
+  @#C1
+  @#C1
+  method /* from org-dartlang-testcase:///patch_lib2.dart */ method3() → core::int
+    return 123;
 }
 
 constants  {

pkg/front_end/testcases/general/multiple_class_patches/main.dart.weak.modular.expect

@@ -18,16 +18,6 @@ static method expect(dynamic expected, dynamic actual) → dynamic {
 }
 
 library /*isNonNullableByDefault*/;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general/multiple_class_patches/patch_lib2.dart:9:7: Error: 'Class' is already declared in this scope.
-// class Class {
-//       ^^^^^
-// pkg/front_end/testcases/general/multiple_class_patches/patch_lib1.dart:9:7: Context: Previous declaration of 'Class'.
-// class Class {
-//       ^^^^^
-//
 import self as test;
 import "dart:_internal" as _in;
 import "dart:core" as core;
@@ -36,17 +26,6 @@ import "dart:_internal";
 import "dart:_internal";
 
 @#C1
-class Class#1#1 extends core::Object { // from org-dartlang-testcase:///patch_lib2.dart
-  synthetic constructor •() → test::Class#1#1
-    : super core::Object::•()
-    ;
-  @#C1
-  method method2() → core::int
-    return 87;
-  @#C1
-  method method3() → core::int
-    return 123;
-}
 @#C1
 class Class extends core::Object {
   synthetic constructor •() → test::Class
@@ -55,10 +34,13 @@ class Class extends core::Object {
   @#C1
   method /* from org-dartlang-testcase:///patch_lib1.dart */ method1() → core::int
     return 42;
-  external method method2() → core::int;
   @#C1
-  method /* from org-dartlang-testcase:///patch_lib1.dart */ method3() → core::int
-    return 321;
+  method /* from org-dartlang-testcase:///patch_lib2.dart */ method2() → core::int
+    return 87;
+  @#C1
+  @#C1
+  method /* from org-dartlang-testcase:///patch_lib2.dart */ method3() → core::int
+    return 123;
 }
 
 constants  {

pkg/front_end/testcases/general/multiple_class_patches/main.dart.weak.outline.expect

@@ -9,16 +9,6 @@ static method expect(dynamic expected, dynamic actual) → dynamic
   ;
 
 library /*isNonNullableByDefault*/;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general/multiple_class_patches/patch_lib2.dart:9:7: Error: 'Class' is already declared in this scope.
-// class Class {
-//       ^^^^^
-// pkg/front_end/testcases/general/multiple_class_patches/patch_lib1.dart:9:7: Context: Previous declaration of 'Class'.
-// class Class {
-//       ^^^^^
-//
 import self as self2;
 import "dart:_internal" as _in;
 import "dart:core" as core;
@@ -27,33 +17,25 @@ import "dart:_internal";
 import "dart:_internal";
 
 @_in::patch
-class Class#1#1 extends core::Object { // from org-dartlang-testcase:///patch_lib2.dart
-  synthetic constructor •() → self2::Class#1#1
-    ;
-  @_in::patch
-  method method2() → core::int
-    ;
-  @_in::patch
-  method method3() → core::int
-    ;
-}
 @_in::patch
 class Class extends core::Object {
   synthetic constructor •() → self2::Class
     ;
   @_in::patch
   external method method1() → core::int;
+  @_in::patch
   external method method2() → core::int;
   @_in::patch
+  @_in::patch
   external method method3() → core::int;
 }
 
 
 Extra constant evaluation status:
-Evaluated: StaticGet @ org-dartlang-testcase:///patch_lib2.dart:8:2 -> InstanceConstant(const _Patch{})
-Evaluated: StaticGet @ org-dartlang-testcase:///patch_lib2.dart:10:4 -> InstanceConstant(const _Patch{})
-Evaluated: StaticGet @ org-dartlang-testcase:///patch_lib2.dart:13:4 -> InstanceConstant(const _Patch{})
+Evaluated: StaticGet @ org-dartlang-testcase:///origin_lib.dart:7:23 -> InstanceConstant(const _Patch{})
 Evaluated: StaticGet @ org-dartlang-testcase:///origin_lib.dart:7:23 -> InstanceConstant(const _Patch{})
 Evaluated: StaticGet @ org-dartlang-testcase:///origin_lib.dart:8:20 -> InstanceConstant(const _Patch{})
+Evaluated: StaticGet @ org-dartlang-testcase:///origin_lib.dart:8:20 -> InstanceConstant(const _Patch{})
+Evaluated: StaticGet @ (unknown position in org-dartlang-testcase:///origin_lib.dart) -> InstanceConstant(const _Patch{})
 Evaluated: StaticGet @ (unknown position in org-dartlang-testcase:///origin_lib.dart) -> InstanceConstant(const _Patch{})
 Extra constant evaluation: evaluated: 6, effectively constant: 6

pkg/front_end/testcases/general/multiple_class_patches/main.dart.weak.transformed.expect

@@ -18,16 +18,6 @@ static method expect(dynamic expected, dynamic actual) → dynamic {
 }
 
 library /*isNonNullableByDefault*/;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general/multiple_class_patches/patch_lib2.dart:9:7: Error: 'Class' is already declared in this scope.
-// class Class {
-//       ^^^^^
-// pkg/front_end/testcases/general/multiple_class_patches/patch_lib1.dart:9:7: Context: Previous declaration of 'Class'.
-// class Class {
-//       ^^^^^
-//
 import self as test;
 import "dart:_internal" as _in;
 import "dart:core" as core;
@@ -36,17 +26,6 @@ import "dart:_internal";
 import "dart:_internal";
 
 @#C1
-class Class#1#1 extends core::Object { // from org-dartlang-testcase:///patch_lib2.dart
-  synthetic constructor •() → test::Class#1#1
-    : super core::Object::•()
-    ;
-  @#C1
-  method method2() → core::int
-    return 87;
-  @#C1
-  method method3() → core::int
-    return 123;
-}
 @#C1
 class Class extends core::Object {
   synthetic constructor •() → test::Class
@@ -55,10 +34,13 @@ class Class extends core::Object {
   @#C1
   method /* from org-dartlang-testcase:///patch_lib1.dart */ method1() → core::int
     return 42;
-  external method method2() → core::int;
   @#C1
-  method /* from org-dartlang-testcase:///patch_lib1.dart */ method3() → core::int
-    return 321;
+  method /* from org-dartlang-testcase:///patch_lib2.dart */ method2() → core::int
+    return 87;
+  @#C1
+  @#C1
+  method /* from org-dartlang-testcase:///patch_lib2.dart */ method3() → core::int
+    return 123;
 }
 
 constants  {

pkg/front_end/testcases/nnbd/platform_nonnullable_fields/main.dart.strong.expect

@@ -13,18 +13,18 @@ library /*isNonNullableByDefault*/;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/nnbd/platform_nonnullable_fields/patch_lib2.dart:32:14: Error: Field 'staticField' should be initialized because its type 'int' doesn't allow null.
+// pkg/front_end/testcases/nnbd/platform_nonnullable_fields/patch_lib2.dart:34:14: Error: Field 'staticField' should be initialized because its type 'int' doesn't allow null.
 //   static int staticField;
 //              ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/platform_nonnullable_fields/patch_lib2.dart:30:7: Error: Field 'field' should be initialized because its type 'int' doesn't allow null.
+// pkg/front_end/testcases/nnbd/platform_nonnullable_fields/patch_lib2.dart:32:7: Error: Field 'field' should be initialized because its type 'int' doesn't allow null.
 //   int field;
 //       ^^^^^
 //
 // pkg/front_end/testcases/nnbd/platform_nonnullable_fields/origin_lib.dart:8:3: Error: This constructor should initialize field 'field' because its type 'int' doesn't allow null.
 //   Class2.constructor1();
 //   ^
-// pkg/front_end/testcases/nnbd/platform_nonnullable_fields/patch_lib2.dart:37:7: Context: 'field' is defined here.
+// pkg/front_end/testcases/nnbd/platform_nonnullable_fields/patch_lib2.dart:39:7: Context: 'field' is defined here.
 //   int field;
 //       ^^^^^
 //
@@ -34,6 +34,7 @@ import "dart:core" as core;
 
 import "dart:_internal";
 
+part patch_lib2.dart;
 @#C1
 class Class1 extends core::Object {
   field core::int field = null /* from org-dartlang-testcase:///patch_lib2.dart */;

pkg/front_end/testcases/nnbd/platform_nonnullable_fields/main.dart.strong.transformed.expect

@@ -13,18 +13,18 @@ library /*isNonNullableByDefault*/;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/nnbd/platform_nonnullable_fields/patch_lib2.dart:32:14: Error: Field 'staticField' should be initialized because its type 'int' doesn't allow null.
+// pkg/front_end/testcases/nnbd/platform_nonnullable_fields/patch_lib2.dart:34:14: Error: Field 'staticField' should be initialized because its type 'int' doesn't allow null.
 //   static int staticField;
 //              ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/platform_nonnullable_fields/patch_lib2.dart:30:7: Error: Field 'field' should be initialized because its type 'int' doesn't allow null.
+// pkg/front_end/testcases/nnbd/platform_nonnullable_fields/patch_lib2.dart:32:7: Error: Field 'field' should be initialized because its type 'int' doesn't allow null.
 //   int field;
 //       ^^^^^
 //
 // pkg/front_end/testcases/nnbd/platform_nonnullable_fields/origin_lib.dart:8:3: Error: This constructor should initialize field 'field' because its type 'int' doesn't allow null.
 //   Class2.constructor1();
 //   ^
-// pkg/front_end/testcases/nnbd/platform_nonnullable_fields/patch_lib2.dart:37:7: Context: 'field' is defined here.
+// pkg/front_end/testcases/nnbd/platform_nonnullable_fields/patch_lib2.dart:39:7: Context: 'field' is defined here.
 //   int field;
 //       ^^^^^
 //
@@ -34,6 +34,7 @@ import "dart:core" as core;
 
 import "dart:_internal";
 
+part patch_lib2.dart;
 @#C1
 class Class1 extends core::Object {
   field core::int field = null /* from org-dartlang-testcase:///patch_lib2.dart */;

pkg/front_end/testcases/nnbd/platform_nonnullable_fields/main.dart.weak.expect

@@ -13,18 +13,18 @@ library /*isNonNullableByDefault*/;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/nnbd/platform_nonnullable_fields/patch_lib2.dart:32:14: Error: Field 'staticField' should be initialized because its type 'int' doesn't allow null.
+// pkg/front_end/testcases/nnbd/platform_nonnullable_fields/patch_lib2.dart:34:14: Error: Field 'staticField' should be initialized because its type 'int' doesn't allow null.
 //   static int staticField;
 //              ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/platform_nonnullable_fields/patch_lib2.dart:30:7: Error: Field 'field' should be initialized because its type 'int' doesn't allow null.
+// pkg/front_end/testcases/nnbd/platform_nonnullable_fields/patch_lib2.dart:32:7: Error: Field 'field' should be initialized because its type 'int' doesn't allow null.
 //   int field;
 //       ^^^^^
 //
 // pkg/front_end/testcases/nnbd/platform_nonnullable_fields/origin_lib.dart:8:3: Error: This constructor should initialize field 'field' because its type 'int' doesn't allow null.
 //   Class2.constructor1();
 //   ^
-// pkg/front_end/testcases/nnbd/platform_nonnullable_fields/patch_lib2.dart:37:7: Context: 'field' is defined here.
+// pkg/front_end/testcases/nnbd/platform_nonnullable_fields/patch_lib2.dart:39:7: Context: 'field' is defined here.
 //   int field;
 //       ^^^^^
 //
@@ -34,6 +34,7 @@ import "dart:core" as core;
 
 import "dart:_internal";
 
+part patch_lib2.dart;
 @#C1
 class Class1 extends core::Object {
   field core::int field = null /* from org-dartlang-testcase:///patch_lib2.dart */;

pkg/front_end/testcases/nnbd/platform_nonnullable_fields/main.dart.weak.modular.expect

@@ -13,18 +13,18 @@ library /*isNonNullableByDefault*/;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/nnbd/platform_nonnullable_fields/patch_lib2.dart:32:14: Error: Field 'staticField' should be initialized because its type 'int' doesn't allow null.
+// pkg/front_end/testcases/nnbd/platform_nonnullable_fields/patch_lib2.dart:34:14: Error: Field 'staticField' should be initialized because its type 'int' doesn't allow null.
 //   static int staticField;
 //              ^^^^^^^^^^^
 //
-// pkg/front_end/testcases/nnbd/platform_nonnullable_fields/patch_lib2.dart:30:7: Error: Field 'field' should be initialized because its type 'int' doesn't allow null.
+// pkg/front_end/testcases/nnbd/platform_nonnullable_fields/patch_lib2.dart:32:7: Error: Field 'field' should be initialized because its type 'int' doesn't allow null.
 //   int field;
 //       ^^^^^
 //
 // pkg/front_end/testcases/nnbd/platform_nonnullable_fields/origin_lib.dart:8:3: Error: This constructor should initialize field 'field' because its type 'int' doesn't allow null.
 //   Class2.constructor1();
 //   ^
-// pkg/front_end/testcases/nnbd/platform_nonnullable_fields/patch_lib2.dart:37:7: Context: 'field' is defined here.
+// pkg/front_end/testcases/nnbd/platform_nonnullable_fields/patch_lib2.dart:39:7: Context: 'field' is defined here.
 //   int field;
 //       ^^^^^
 //
@@ -34,6 +34,7 @@ import "dart:core" as core;
 
 import "dart:_internal";
 
+part patch_lib2.dart;
 @#C1
 class Class1 extends core::Object {
   field core::int field = null /* from org-dartlang-testcase:///patch_lib2.dart */;

pkg/front_end/testcases/nnbd/platform_nonnullable_fields/main.dart.weak.outline.expect

@@ -10,7 +10,7 @@ library /*isNonNullableByDefault*/;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/nnbd/platform_nonnullable_fields/patch_lib2.dart:32:14: Error: Field 'staticField' should be initialized because its type 'int' doesn't allow null.
+// pkg/front_end/testcases/nnbd/platform_nonnullable_fields/patch_lib2.dart:34:14: Error: Field 'staticField' should be initialized because its type 'int' doesn't allow null.
 //   static int staticField;
 //              ^^^^^^^^^^^
 //
@@ -20,6 +20,7 @@ import "dart:core" as core;
 
 import "dart:_internal";
 
+part patch_lib2.dart;
 @_in::patch
 class Class1 extends core::Object {
   field core::int field /* from org-dartlang-testcase:///patch_lib2.dart */;