Reland "[cfe] Improve encoding of set/list literals for unified colle…

…ctions" Change-Id: I4f8098e110c9a5e5d6e102b8c6230e85c1575c6a Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/175040 Reviewed-by: Dmitry Stefantsov <dmitryas@google.com> Commit-Queue: Johnni Winther <johnniwinther@google.com>
dart-lang · Dec 4, 2020 · f7ae22a · f7ae22a
1 parent c7f3645
commit f7ae22a
Show file tree

Hide file tree

Showing 90 changed files with 8,916 additions and 8,109 deletions.
diff --git a/pkg/front_end/lib/src/fasta/kernel/transform_collections.dart b/pkg/front_end/lib/src/fasta/kernel/transform_collections.dart
diff --git a/pkg/front_end/lib/src/fasta/source/source_loader.dart b/pkg/front_end/lib/src/fasta/source/source_loader.dart
@@ -1447,13 +1447,15 @@ class Iterable<E> {
   Iterator<E> get iterator => null;
 }
 
-class List<E> extends Iterable {
+class List<E> extends Iterable<E> {
   factory List() => null;
   factory List.unmodifiable(elements) => null;
   factory List.filled(int length, E fill, {bool growable = false}) => null;
   factory List.generate(int length, E generator(int index),
       {bool growable = true}) => null;
-  void add(E) {}
+  factory List.of() => null;
+  void add(E element) {}
+  void addAll(Iterable<E> iterable) {}
   E operator [](int index) => null;
 }
 
@@ -1512,7 +1514,9 @@ class Symbol {}
 class Set<E> {
   factory Set() = Set<E>._fake;
   external factory Set._fake();
-  void add(E) {}
+  external factory Set.of();
+  void add(E element) {}
+  void addAll(Iterable<E> iterable) {}
 }
 
 class Type {}

diff --git a/pkg/front_end/test/fasta/bootstrap_test.dart b/pkg/front_end/test/fasta/bootstrap_test.dart
@@ -46,16 +46,17 @@ Future main() async {
 
 Future runCompiler(Uri compiler, Uri input, Uri output) async {
   Uri dartVm = Uri.base.resolveUri(new Uri.file(Platform.resolvedExecutable));
-  StdioProcess result = await StdioProcess.run(
-      dartVm.toFilePath(),
-      <String>[
-        compiler.toFilePath(),
-        "${Flags.compileSdk}=sdk/",
-        "${Flags.output}=${output.toFilePath()}",
-        Flags.verify,
-        input.toFilePath(),
-      ],
-      suppressOutput: false);
+  String executable = dartVm.toFilePath();
+  List<String> arguments = <String>[
+    compiler.toFilePath(),
+    "${Flags.compileSdk}=sdk/",
+    "${Flags.output}=${output.toFilePath()}",
+    Flags.verify,
+    input.toFilePath(),
+  ];
+  print('Running: $executable ${arguments.join(' ')}');
+  StdioProcess result =
+      await StdioProcess.run(executable, arguments, suppressOutput: false);
   if (result.exitCode != 0) {
     throw "Compilation failed:\n${result.output}";
   }

diff --git a/pkg/front_end/test/static_types/data/null_aware_spread.dart b/pkg/front_end/test/static_types/data/null_aware_spread.dart
@@ -12,40 +12,30 @@ nullAwareListSpread(List<String> list) {
       /*cfe.List<String>*/
       /*cfe:nnbd.List<String!>!*/
       [
-    /*invoke: void*/
     /*cfe.String*/
     /*cfe:nnbd.String!*/
     'foo',
-    /*invoke: void*/
-    /*cfe.current: String*/
-    /*cfe:nnbd.current: String!*/
     ...?
     /*cfe.List<String>*/
     /*cfe:nnbd.List<String!>!*/
-    list
+    /*invoke: void*/ list
   ];
 }
 
 nullAwareSetSpread(Set<String> set) {
   /*cfe.update: Set<String>*/
   /*cfe:nnbd.update: Set<String!>!*/
   set =
-      /*cfe.invoke: LinkedHashSet<String>!*/
-      /*cfe:nnbd.invoke: LinkedHashSet<String!>!*/
-      /*cfe.<String>*/
-      /*cfe:nnbd.<String!>*/
+      /*cfe.Set<String>*/
+      /*cfe:nnbd.Set<String!>!*/
       {
-    /*invoke: bool!*/
     /*cfe.String*/
     /*cfe:nnbd.String!*/
     'foo',
-    /*invoke: bool!*/
-    /*cfe.current: String*/
-    /*cfe:nnbd.current: String!*/
     ...?
     /*cfe.Set<String>*/
     /*cfe:nnbd.Set<String!>!*/
-    set
+    /*invoke: void*/ set
   };
 }
 

diff --git a/pkg/front_end/testcases/expression/spread_element.expression.yaml.expect b/pkg/front_end/testcases/expression/spread_element.expression.yaml.expect
@@ -2,12 +2,5 @@ Errors: {
 }
 method /* from org-dartlang-debug:synthetic_debug_expression */ debugExpr() → dynamic
   return block {
-    final dart.core::List<dart.core::String*>* #t1 = <dart.core::String*>[];
-    {
-      dart.core::Iterator<dart.core::String*>* :sync-for-iterator = main::listOfStrings.{dart.core::Iterable::iterator};
-      for (; :sync-for-iterator.{dart.core::Iterator::moveNext}(); ) {
-        final dart.core::String* #t2 = :sync-for-iterator.{dart.core::Iterator::current};
-        #t1.{dart.core::List::add}{Invariant}(#t2);
-      }
-    }
+    final dart.core::List<dart.core::String*>* #t1 = dart.core::List::of<dart.core::String*>(main::listOfStrings);
   } =>#t1;
diff --git a/pkg/front_end/testcases/general/constants/const_collections.dart.strong.expect b/pkg/front_end/testcases/general/constants/const_collections.dart.strong.expect
@@ -405,9 +405,7 @@ static const field core::List<core::String*>* nullList = #C3;
 static const field core::List<core::String*>* foo = #C8;
 static const field core::List<core::String*>* bar = #C10;
 static field core::List<core::String*>* barAsVar = block {
-  final core::List<core::String*>* #t1 = <core::String*>[];
-  for (final core::String* #t2 in #C8)
-    #t1.{core::List::add}{Invariant}(#t2);
+  final core::List<core::String*>* #t1 = core::List::of<core::String*>(#C8);
   #t1.{core::List::add}{Invariant}("!");
 } =>#t1;
 static const field core::List<core::String*>* barWithNullSpread = invalid-expression "Null value during constant evaluation.";
@@ -481,9 +479,9 @@ static method main() → dynamic {
   core::print(#C17);
   core::print(#C22);
   core::print( block {
-    final core::Set<core::String*>* #t3 = col::LinkedHashSet::•<core::String*>();
-    #t3.{core::Set::add}{Invariant}("hello");
-  } =>#t3);
+    final core::Set<core::String*>* #t2 = col::LinkedHashSet::•<core::String*>();
+    #t2.{core::Set::add}{Invariant}("hello");
+  } =>#t2);
   core::print(#C26);
 }
 

diff --git a/pkg/front_end/testcases/general/constants/const_collections.dart.strong.transformed.expect b/pkg/front_end/testcases/general/constants/const_collections.dart.strong.transformed.expect
@@ -405,14 +405,7 @@ static const field core::List<core::String*>* nullList = #C3;
 static const field core::List<core::String*>* foo = #C8;
 static const field core::List<core::String*>* bar = #C10;
 static field core::List<core::String*>* barAsVar = block {
-  final core::List<core::String*>* #t1 = <core::String*>[];
-  {
-    core::Iterator<core::String*>* :sync-for-iterator = (#C8).{core::Iterable::iterator};
-    for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-      final core::String* #t2 = :sync-for-iterator.{core::Iterator::current};
-      #t1.{core::List::add}{Invariant}(#t2);
-    }
-  }
+  final core::List<core::String*>* #t1 = core::List::of<core::String*>(#C8);
   #t1.{core::List::add}{Invariant}("!");
 } =>#t1;
 static const field core::List<core::String*>* barWithNullSpread = invalid-expression "Null value during constant evaluation.";
@@ -486,9 +479,9 @@ static method main() → dynamic {
   core::print(#C17);
   core::print(#C22);
   core::print( block {
-    final core::Set<core::String*>* #t3 = new col::_CompactLinkedHashSet::•<core::String*>();
-    #t3.{core::Set::add}{Invariant}("hello");
-  } =>#t3);
+    final core::Set<core::String*>* #t2 = new col::_CompactLinkedHashSet::•<core::String*>();
+    #t2.{core::Set::add}{Invariant}("hello");
+  } =>#t2);
   core::print(#C26);
 }
 

diff --git a/pkg/front_end/testcases/general/control_flow_collection.dart.strong.expect b/pkg/front_end/testcases/general/control_flow_collection.dart.strong.expect
@@ -5,8 +5,7 @@ import "dart:collection" as col;
 
 static method main() → dynamic {
   final core::List<core::int*>* aList = block {
-    final core::List<core::int*>* #t1 = <core::int*>[];
-    #t1.{core::List::add}{Invariant}(1);
+    final core::List<core::int*>* #t1 = <core::int*>[1];
     if(self::oracle() as{TypeError,ForDynamic} core::bool*)
       #t1.{core::List::add}{Invariant}(2);
     if(self::oracle() as{TypeError,ForDynamic} core::bool*)

diff --git a/pkg/front_end/testcases/general/control_flow_collection.dart.strong.transformed.expect b/pkg/front_end/testcases/general/control_flow_collection.dart.strong.transformed.expect
@@ -5,8 +5,7 @@ import "dart:collection" as col;
 
 static method main() → dynamic {
   final core::List<core::int*>* aList = block {
-    final core::List<core::int*>* #t1 = <core::int*>[];
-    #t1.{core::List::add}{Invariant}(1);
+    final core::List<core::int*>* #t1 = <core::int*>[1];
     if(self::oracle() as{TypeError,ForDynamic} core::bool*)
       #t1.{core::List::add}{Invariant}(2);
     if(self::oracle() as{TypeError,ForDynamic} core::bool*)
@@ -107,4 +106,4 @@ Evaluated: MethodInvocation @ org-dartlang-testcase:///control_flow_collection.d
 Evaluated: MethodInvocation @ org-dartlang-testcase:///control_flow_collection.dart:18:26 -> IntConstant(-1)
 Evaluated: MethodInvocation @ org-dartlang-testcase:///control_flow_collection.dart:27:29 -> IntConstant(-1)
 Evaluated: MethodInvocation @ org-dartlang-testcase:///control_flow_collection.dart:27:33 -> IntConstant(-1)
-Extra constant evaluation: evaluated: 160, effectively constant: 4
+Extra constant evaluation: evaluated: 158, effectively constant: 4