[vm] Rename the default implementation classes of Map and Set.

_InternalLinkedHashMap => _Map _InternalImmutableLinkedHashMap => _ConstMap _InternalLinkedHashSet => _Set _InternalImmutableLinkedHashSet => _ConstSet This makes things nicer to read in places that display implementation names, such as stack traces, debuggers, profilers and inspectors. TEST=ci Change-Id: Iec851c80ea2086cbe79934565dbf35f04809a836 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/266303 Reviewed-by: Daco Harkes <[email protected]> Commit-Queue: Ryan Macnak <[email protected]> Reviewed-by: Chloe Stefantsova <[email protected]>
schwa423 · Nov 15, 2022 · a2de36e · a2de36e
1 parent a2adab7
commit a2de36e
Show file tree

Hide file tree

Showing 88 changed files with 1,019 additions and 1,073 deletions.
diff --git a/pkg/front_end/lib/src/fasta/source/source_loader.dart b/pkg/front_end/lib/src/fasta/source/source_loader.dart
@@ -2925,8 +2925,8 @@ abstract class LinkedHashMap<K, V> implements Map<K, V> {
       bool Function(dynamic)? isValidKey}) => null;
 }
 
-class _InternalLinkedHashMap<K, V> {
-  _InternalLinkedHashMap();
+class _Map<K, V> {
+  _Map();
 }
 
 abstract class LinkedHashSet<E> implements Set<E> {
@@ -2936,8 +2936,8 @@ abstract class LinkedHashSet<E> implements Set<E> {
       bool Function(dynamic)? isValidKey}) => null;
 }
 
-class _InternalLinkedHashSet<E> {
-  _InternalLinkedHashSet();
+class _Set<E> {
+  _Set();
 }
 
 class _UnmodifiableSet {

diff --git a/pkg/front_end/testcases/expression/set_literal.expression.yaml.expect b/pkg/front_end/testcases/expression/set_literal.expression.yaml.expect
@@ -2,6 +2,6 @@ Errors: {
 }
 method /* from org-dartlang-debug:synthetic_debug_expression */ debugExpr() → dynamic
   return block {
-    final dart.core::Set<dart.core::String> #t1 = new dart.collection::_InternalLinkedHashSet::•<dart.core::String>();
+    final dart.core::Set<dart.core::String> #t1 = new dart.collection::_Set::•<dart.core::String>();
     #t1.{dart.core::Set::add}{Invariant}("a"){(dart.core::String) → dart.core::bool};
   } =>#t1;
diff --git a/pkg/front_end/testcases/general/bounds_literals.dart.weak.transformed.expect b/pkg/front_end/testcases/general/bounds_literals.dart.weak.transformed.expect
@@ -146,52 +146,52 @@ static method test() → dynamic {
   <self::G<self::ConcreteClass>, self::G<self::Class<self::ConcreteClass>>>{};
   <self::G<core::Object>, self::G<core::int>>{};
   block {
-    final core::Set<self::Class<dynamic>> #t1 = new col::_InternalLinkedHashSet::•<self::Class<dynamic>>();
+    final core::Set<self::Class<dynamic>> #t1 = new col::_Set::•<self::Class<dynamic>>();
   } =>#t1;
   block {
-    final core::Set<dynamic> #t2 = new col::_InternalLinkedHashSet::•<dynamic>();
+    final core::Set<dynamic> #t2 = new col::_Set::•<dynamic>();
   } =>#t2;
   block {
-    final core::Set<self::Class<dynamic>> #t3 = new col::_InternalLinkedHashSet::•<self::Class<dynamic>>();
+    final core::Set<self::Class<dynamic>> #t3 = new col::_Set::•<self::Class<dynamic>>();
   } =>#t3;
   block {
-    final core::Set<self::Class<dynamic>> #t4 = new col::_InternalLinkedHashSet::•<self::Class<dynamic>>();
+    final core::Set<self::Class<dynamic>> #t4 = new col::_Set::•<self::Class<dynamic>>();
   } =>#t4;
   block {
-    final core::Set<core::Object> #t5 = new col::_InternalLinkedHashSet::•<core::Object>();
+    final core::Set<core::Object> #t5 = new col::_Set::•<core::Object>();
   } =>#t5;
   block {
-    final core::Set<core::int> #t6 = new col::_InternalLinkedHashSet::•<core::int>();
+    final core::Set<core::int> #t6 = new col::_Set::•<core::int>();
   } =>#t6;
   block {
-    final core::Set<self::ConcreteClass> #t7 = new col::_InternalLinkedHashSet::•<self::ConcreteClass>();
+    final core::Set<self::ConcreteClass> #t7 = new col::_Set::•<self::ConcreteClass>();
   } =>#t7;
   block {
-    final core::Set<self::Class<self::ConcreteClass>> #t8 = new col::_InternalLinkedHashSet::•<self::Class<self::ConcreteClass>>();
+    final core::Set<self::Class<self::ConcreteClass>> #t8 = new col::_Set::•<self::Class<self::ConcreteClass>>();
   } =>#t8;
   block {
-    final core::Set<self::G<self::Class<dynamic>>> #t9 = new col::_InternalLinkedHashSet::•<self::G<self::Class<dynamic>>>();
+    final core::Set<self::G<self::Class<dynamic>>> #t9 = new col::_Set::•<self::G<self::Class<dynamic>>>();
   } =>#t9;
   block {
-    final core::Set<self::G<self::Class<dynamic>>> #t10 = new col::_InternalLinkedHashSet::•<self::G<self::Class<dynamic>>>();
+    final core::Set<self::G<self::Class<dynamic>>> #t10 = new col::_Set::•<self::G<self::Class<dynamic>>>();
   } =>#t10;
   block {
-    final core::Set<self::G<self::Class<dynamic>>> #t11 = new col::_InternalLinkedHashSet::•<self::G<self::Class<dynamic>>>();
+    final core::Set<self::G<self::Class<dynamic>>> #t11 = new col::_Set::•<self::G<self::Class<dynamic>>>();
   } =>#t11;
   block {
-    final core::Set<self::G<self::Class<dynamic>>> #t12 = new col::_InternalLinkedHashSet::•<self::G<self::Class<dynamic>>>();
+    final core::Set<self::G<self::Class<dynamic>>> #t12 = new col::_Set::•<self::G<self::Class<dynamic>>>();
   } =>#t12;
   block {
-    final core::Set<self::G<self::ConcreteClass>> #t13 = new col::_InternalLinkedHashSet::•<self::G<self::ConcreteClass>>();
+    final core::Set<self::G<self::ConcreteClass>> #t13 = new col::_Set::•<self::G<self::ConcreteClass>>();
   } =>#t13;
   block {
-    final core::Set<self::G<self::Class<self::ConcreteClass>>> #t14 = new col::_InternalLinkedHashSet::•<self::G<self::Class<self::ConcreteClass>>>();
+    final core::Set<self::G<self::Class<self::ConcreteClass>>> #t14 = new col::_Set::•<self::G<self::Class<self::ConcreteClass>>>();
   } =>#t14;
   block {
-    final core::Set<self::G<core::Object>> #t15 = new col::_InternalLinkedHashSet::•<self::G<core::Object>>();
+    final core::Set<self::G<core::Object>> #t15 = new col::_Set::•<self::G<core::Object>>();
   } =>#t15;
   block {
-    final core::Set<self::G<core::int>> #t16 = new col::_InternalLinkedHashSet::•<self::G<core::int>>();
+    final core::Set<self::G<core::int>> #t16 = new col::_Set::•<self::G<core::int>>();
   } =>#t16;
   core::_GrowableList::•<self::Class<dynamic>>(0);
   core::_GrowableList::•<dynamic>(0);

diff --git a/pkg/front_end/testcases/general/constants/const_collections.dart.weak.transformed.expect b/pkg/front_end/testcases/general/constants/const_collections.dart.weak.transformed.expect
@@ -354,7 +354,7 @@ static method main() → dynamic {
   core::print(#C11);
   core::print(#C14);
   core::print( block {
-    final core::Set<core::String> #t2 = new col::_InternalLinkedHashSet::•<core::String>();
+    final core::Set<core::String> #t2 = new col::_Set::•<core::String>();
     #t2.{core::Set::add}{Invariant}("hello"){(core::String) → core::bool};
   } =>#t2);
   core::print(#C16);

diff --git a/...nt_end/testcases/general/constants/potentially_constant_type.dart.weak.transformed.expect b/...nt_end/testcases/general/constants/potentially_constant_type.dart.weak.transformed.expect
@@ -161,7 +161,7 @@ class Class<T extends core::Object* = dynamic> extends core::Object /*hasConstCo
   final field dynamic field15;
   const constructor •(dynamic o) → self::Class<self::Class::T*>*
     : self::Class::field1 = #C1, self::Class::field5 = core::_GrowableList::•<invalid-type>(0), self::Class::field6 = block {
-      final core::Set<invalid-type>* #t1 = new col::_InternalLinkedHashSet::•<invalid-type>();
+      final core::Set<invalid-type>* #t1 = new col::_Set::•<invalid-type>();
     } =>#t1, self::Class::field7 = <invalid-type, invalid-type>{}, self::Class::field8 = o is invalid-type, self::Class::field9 = o is self::Class<invalid-type>*, self::Class::field10 = o as invalid-type, self::Class::field11 = o as self::Class<invalid-type>*, self::Class::field15 = core::_GrowableList::•<self::Class<invalid-type>*>(0), super core::Object::•()
     ;
   method method() → void {
@@ -344,7 +344,7 @@ class Class<T extends core::Object? = dynamic> extends core::Object /*hasConstCo
   final field dynamic field15;
   const constructor •(dynamic o) → self2::Class<self2::Class::T%>
     : self2::Class::field1 = #C1, self2::Class::field5 = core::_GrowableList::•<invalid-type>(0), self2::Class::field6 = block {
-      final core::Set<invalid-type> #t2 = new col::_InternalLinkedHashSet::•<invalid-type>();
+      final core::Set<invalid-type> #t2 = new col::_Set::•<invalid-type>();
     } =>#t2, self2::Class::field7 = <invalid-type, invalid-type>{}, self2::Class::field8 = o is{ForNonNullableByDefault} self2::Class::T%, self2::Class::field9 = o is{ForNonNullableByDefault} self2::Class<self2::Class::T%>, self2::Class::field10 = o as{ForNonNullableByDefault} self2::Class::T%, self2::Class::field11 = o{self2::Class::T%} as{ForNonNullableByDefault} self2::Class<self2::Class::T%>, self2::Class::field15 = core::_GrowableList::•<self2::Class<invalid-type>>(0), super core::Object::•()
     ;
   method method() → void {
@@ -586,7 +586,7 @@ class Class<T extends core::Object? = dynamic> extends core::Object /*hasConstCo
   final field dynamic field16;
   const constructor •(dynamic o) → self3::Class<self3::Class::T%>
     : self3::Class::field1 = self3::Class::T%, self3::Class::field2 = self3::Class<self3::Class::T%>, self3::Class::field3 = #C24<self3::Class::T%>, self3::Class::field4 = #C24<self3::Class::T%>, self3::Class::field5 = core::_GrowableList::•<invalid-type>(0), self3::Class::field6 = block {
-      final core::Set<invalid-type> #t3 = new col::_InternalLinkedHashSet::•<invalid-type>();
+      final core::Set<invalid-type> #t3 = new col::_Set::•<invalid-type>();
     } =>#t3, self3::Class::field7 = <invalid-type, invalid-type>{}, self3::Class::field8 = o is{ForNonNullableByDefault} self3::Class::T%, self3::Class::field9 = o is{ForNonNullableByDefault} self3::Class<self3::Class::T%>, self3::Class::field10 = o as{ForNonNullableByDefault} self3::Class::T%, self3::Class::field11 = o{self3::Class::T%} as{ForNonNullableByDefault} self3::Class<self3::Class::T%>, self3::Class::field12 = #C25<self3::Class::T%>, self3::Class::field13 = #C25<self3::Class::T%>, self3::Class::field14 = #C24<self3::Class<self3::Class::T%>>, self3::Class::field15 = core::_GrowableList::•<self3::Class<invalid-type>>(0), self3::Class::field16 = #C26, super core::Object::•()
     ;
   method method() → void {

diff --git a/pkg/front_end/testcases/general/control_flow_collection.dart.weak.transformed.expect b/pkg/front_end/testcases/general/control_flow_collection.dart.weak.transformed.expect
@@ -34,7 +34,7 @@ static method main() → dynamic {
       #t1.{core::List::add}{Invariant}(i){(core::int) → void};
   } =>#t1;
   final core::Set<core::int> aSet = block {
-    final core::Set<core::int> #t2 = new col::_InternalLinkedHashSet::•<core::int>();
+    final core::Set<core::int> #t2 = new col::_Set::•<core::int>();
     #t2.{core::Set::add}{Invariant}(1){(core::int) → core::bool};
     if(self::oracle() as{TypeError,ForDynamic,ForNonNullableByDefault} core::bool)
       #t2.{core::Set::add}{Invariant}(2){(core::int) → core::bool};