Revert "[dart] Enable constant-update-2018"

This reverts commit 9bbd3192f4.

Reason for revert: Reverting enabling of constant-update-2018 by default as some blocking issues were found that are breaking Flutter and preventing rolls of Dart into Flutter. Once the blocking issues are addressed and fixed this CL will be relanded.

Original change's description:
> [dart] Enable constant-update-2018
> 
> Change-Id: Ib3942b4f6e336a02826305d9f81839333a5464a0
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/106943
> Reviewed-by: Vyacheslav Egorov <vegorov@google.com>
> Commit-Queue: Vyacheslav Egorov <vegorov@google.com>

TBR=paulberry@google.com,vegorov@google.com,athom@google.com,vsm@google.com,aadilmaan@google.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Change-Id: I5796881412cec464f450ff3894ca253c58edc4a2
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/109308
Reviewed-by: Siva Annamalai <asiva@google.com>
Reviewed-by: Vijay Menon <vsm@google.com>

pkg/analyzer/lib/src/dart/analysis/experiments.g.dart

@@ -24,7 +24,7 @@ const _knownFeatures = <String, ExperimentalFeature>{
 };
 
 List<bool> _buildExperimentalFlagsArray() => <bool>[
-      true, // constant-update-2018
+      IsEnabledByDefault.constant_update_2018,
       true, // control-flow-collections
       IsEnabledByDefault.extension_methods,
       IsEnabledByDefault.non_nullable,
@@ -74,8 +74,7 @@ class ExperimentalFeatures {
       EnableString.constant_update_2018,
       IsEnabledByDefault.constant_update_2018,
       IsExpired.constant_update_2018,
-      'Enhanced constant expressions',
-      firstSupportedVersion: '2.4.1');
+      'Enhanced constant expressions');
 
   static const control_flow_collections = const ExperimentalFeature(
       1,
@@ -146,7 +145,7 @@ class ExperimentalFeatures {
 /// enabled by default.
 class IsEnabledByDefault {
   /// Default state of the experiment "constant-update-2018"
-  static const bool constant_update_2018 = true;
+  static const bool constant_update_2018 = false;
 
   /// Default state of the experiment "control-flow-collections"
   static const bool control_flow_collections = true;

pkg/front_end/lib/src/api_prototype/experimental_flags.dart

@@ -44,7 +44,7 @@ ExperimentalFlag parseExperimentalFlag(String flag) {
 }
 
 const Map<ExperimentalFlag, bool> defaultExperimentalFlags = {
-  ExperimentalFlag.constantUpdate2018: true,
+  ExperimentalFlag.constantUpdate2018: false,
   ExperimentalFlag.controlFlowCollections: true,
   ExperimentalFlag.extensionMethods: false,
   ExperimentalFlag.nonNullable: false,

pkg/front_end/testcases/general/DeltaBlue.dart.strong.expect

@@ -18,7 +18,7 @@ class Strength extends core::Object {
     : self::Strength::value = value, self::Strength::name = name, super core::Object::•()
     ;
   method nextWeaker() → self::Strength
-    return (#C19).{core::List::[]}(this.{self::Strength::value});
+    return const <self::Strength>[self::STRONG_PREFERRED, self::PREFERRED, self::STRONG_DEFAULT, self::NORMAL, self::WEAK_DEFAULT, self::WEAKEST].{core::List::[]}(this.{self::Strength::value});
   static method stronger(self::Strength s1, self::Strength s2) → core::bool {
     return s1.{self::Strength::value}.{core::num::<}(s2.{self::Strength::value});
   }
@@ -54,7 +54,7 @@ abstract class Constraint extends core::Object {
   method satisfy(dynamic mark) → self::Constraint {
     this.{self::Constraint::chooseMethod}(mark as{TypeError} core::int);
     if(!this.{self::Constraint::isSatisfied}()) {
-      if(this.{self::Constraint::strength}.{core::Object::==}(#C22)) {
+      if(this.{self::Constraint::strength}.{core::Object::==}(self::REQUIRED)) {
         core::print("Could not satisfy a required constraint!");
       }
       return null;
@@ -131,39 +131,39 @@ class EditConstraint extends self::UnaryConstraint {
 abstract class BinaryConstraint extends self::Constraint {
   field self::Variable v1;
   field self::Variable v2;
-  field core::int direction = #C1;
+  field core::int direction = self::NONE;
   constructor •(self::Variable v1, self::Variable v2, self::Strength strength) → self::BinaryConstraint
     : self::BinaryConstraint::v1 = v1, self::BinaryConstraint::v2 = v2, super self::Constraint::•(strength) {
     this.{self::Constraint::addConstraint}();
   }
   method chooseMethod(core::int mark) → void {
     if(this.{self::BinaryConstraint::v1}.{self::Variable::mark}.{core::num::==}(mark)) {
-      this.{self::BinaryConstraint::direction} = !this.{self::BinaryConstraint::v2}.{self::Variable::mark}.{core::num::==}(mark) && self::Strength::stronger(this.{self::Constraint::strength}, this.{self::BinaryConstraint::v2}.{self::Variable::walkStrength}) ?{core::int} #C4 : #C1;
+      this.{self::BinaryConstraint::direction} = !this.{self::BinaryConstraint::v2}.{self::Variable::mark}.{core::num::==}(mark) && self::Strength::stronger(this.{self::Constraint::strength}, this.{self::BinaryConstraint::v2}.{self::Variable::walkStrength}) ?{core::int} self::FORWARD : self::NONE;
     }
     if(this.{self::BinaryConstraint::v2}.{self::Variable::mark}.{core::num::==}(mark)) {
-      this.{self::BinaryConstraint::direction} = !this.{self::BinaryConstraint::v1}.{self::Variable::mark}.{core::num::==}(mark) && self::Strength::stronger(this.{self::Constraint::strength}, this.{self::BinaryConstraint::v1}.{self::Variable::walkStrength}) ?{core::int} #C20 : #C1;
+      this.{self::BinaryConstraint::direction} = !this.{self::BinaryConstraint::v1}.{self::Variable::mark}.{core::num::==}(mark) && self::Strength::stronger(this.{self::Constraint::strength}, this.{self::BinaryConstraint::v1}.{self::Variable::walkStrength}) ?{core::int} self::BACKWARD : self::NONE;
     }
     if(self::Strength::weaker(this.{self::BinaryConstraint::v1}.{self::Variable::walkStrength}, this.{self::BinaryConstraint::v2}.{self::Variable::walkStrength})) {
-      this.{self::BinaryConstraint::direction} = self::Strength::stronger(this.{self::Constraint::strength}, this.{self::BinaryConstraint::v1}.{self::Variable::walkStrength}) ?{core::int} #C20 : #C1;
+      this.{self::BinaryConstraint::direction} = self::Strength::stronger(this.{self::Constraint::strength}, this.{self::BinaryConstraint::v1}.{self::Variable::walkStrength}) ?{core::int} self::BACKWARD : self::NONE;
     }
     else {
-      this.{self::BinaryConstraint::direction} = self::Strength::stronger(this.{self::Constraint::strength}, this.{self::BinaryConstraint::v2}.{self::Variable::walkStrength}) ?{core::int} #C4 : #C20;
+      this.{self::BinaryConstraint::direction} = self::Strength::stronger(this.{self::Constraint::strength}, this.{self::BinaryConstraint::v2}.{self::Variable::walkStrength}) ?{core::int} self::FORWARD : self::BACKWARD;
     }
   }
   method addToGraph() → void {
     this.{self::BinaryConstraint::v1}.{self::Variable::addConstraint}(this);
     this.{self::BinaryConstraint::v2}.{self::Variable::addConstraint}(this);
-    this.{self::BinaryConstraint::direction} = #C1;
+    this.{self::BinaryConstraint::direction} = self::NONE;
   }
   method isSatisfied() → core::bool
-    return !this.{self::BinaryConstraint::direction}.{core::num::==}(#C1);
+    return !this.{self::BinaryConstraint::direction}.{core::num::==}(self::NONE);
   method markInputs(core::int mark) → void {
     this.{self::BinaryConstraint::input}().{self::Variable::mark} = mark;
   }
   method input() → self::Variable
-    return this.{self::BinaryConstraint::direction}.{core::num::==}(#C4) ?{self::Variable} this.{self::BinaryConstraint::v1} : this.{self::BinaryConstraint::v2};
+    return this.{self::BinaryConstraint::direction}.{core::num::==}(self::FORWARD) ?{self::Variable} this.{self::BinaryConstraint::v1} : this.{self::BinaryConstraint::v2};
   method output() → self::Variable
-    return this.{self::BinaryConstraint::direction}.{core::num::==}(#C4) ?{self::Variable} this.{self::BinaryConstraint::v2} : this.{self::BinaryConstraint::v1};
+    return this.{self::BinaryConstraint::direction}.{core::num::==}(self::FORWARD) ?{self::Variable} this.{self::BinaryConstraint::v2} : this.{self::BinaryConstraint::v1};
   method recalculate() → void {
     self::Variable ihn = this.{self::BinaryConstraint::input}();
     self::Variable out = this.{self::BinaryConstraint::output}();
@@ -173,7 +173,7 @@ abstract class BinaryConstraint extends self::Constraint {
       this.{self::Constraint::execute}();
   }
   method markUnsatisfied() → void {
-    this.{self::BinaryConstraint::direction} = #C1;
+    this.{self::BinaryConstraint::direction} = self::NONE;
   }
   method inputsKnown(core::int mark) → core::bool {
     self::Variable i = this.{self::BinaryConstraint::input}();
@@ -184,7 +184,7 @@ abstract class BinaryConstraint extends self::Constraint {
       this.{self::BinaryConstraint::v1}.{self::Variable::removeConstraint}(this);
     if(!this.{self::BinaryConstraint::v2}.{core::Object::==}(null))
       this.{self::BinaryConstraint::v2}.{self::Variable::removeConstraint}(this);
-    this.{self::BinaryConstraint::direction} = #C1;
+    this.{self::BinaryConstraint::direction} = self::NONE;
   }
 }
 class ScaleConstraint extends self::BinaryConstraint {
@@ -210,7 +210,7 @@ class ScaleConstraint extends self::BinaryConstraint {
     this.{self::ScaleConstraint::scale}.{self::Variable::mark} = this.{self::ScaleConstraint::offset}.{self::Variable::mark} = mark;
   }
   method execute() → void {
-    if(this.{self::BinaryConstraint::direction}.{core::num::==}(#C4)) {
+    if(this.{self::BinaryConstraint::direction}.{core::num::==}(self::FORWARD)) {
       this.{self::BinaryConstraint::v2}.{self::Variable::value} = this.{self::BinaryConstraint::v1}.{self::Variable::value}.{core::num::*}(this.{self::ScaleConstraint::scale}.{self::Variable::value}).{core::num::+}(this.{self::ScaleConstraint::offset}.{self::Variable::value});
     }
     else {
@@ -238,7 +238,7 @@ class Variable extends core::Object {
   field core::List<self::Constraint> constraints = <self::Constraint>[];
   field self::Constraint determinedBy = null;
   field core::int mark = 0;
-  field self::Strength walkStrength = #C18;
+  field self::Strength walkStrength = self::WEAKEST;
   field core::bool stay = true;
   field core::int value;
   final field core::String name;
@@ -269,7 +269,7 @@ class Planner extends core::Object {
     c.{self::Constraint::markUnsatisfied}();
     c.{self::Constraint::removeFromGraph}();
     core::List<self::Constraint> unsatisfied = this.{self::Planner::removePropagateFrom}(out);
-    self::Strength strength = #C22;
+    self::Strength strength = self::REQUIRED;
     do {
       for (core::int i = 0; i.{core::num::<}(unsatisfied.{core::List::length}); i = i.{core::num::+}(1)) {
         self::Constraint u = unsatisfied.{core::List::[]}(i);
@@ -278,7 +278,7 @@ class Planner extends core::Object {
       }
       strength = strength.{self::Strength::nextWeaker}();
     }
-    while (!strength.{core::Object::==}(#C18))
+    while (!strength.{core::Object::==}(self::WEAKEST))
   }
   method newMark() → core::int
     return this.{self::Planner::currentMark} = this.{self::Planner::currentMark}.{core::num::+}(1);
@@ -320,7 +320,7 @@ class Planner extends core::Object {
   }
   method removePropagateFrom(self::Variable out) → core::List<self::Constraint> {
     out.{self::Variable::determinedBy} = null;
-    out.{self::Variable::walkStrength} = #C18;
+    out.{self::Variable::walkStrength} = self::WEAKEST;
     out.{self::Variable::stay} = true;
     core::List<self::Constraint> unsatisfied = <self::Constraint>[];
     core::List<self::Variable> todo = <self::Variable>[out];
@@ -367,16 +367,16 @@ class Plan extends core::Object {
     }
   }
 }
-static const field self::Strength REQUIRED = #C22;
-static const field self::Strength STRONG_PREFERRED = #C3;
-static const field self::Strength PREFERRED = #C6;
-static const field self::Strength STRONG_DEFAULT = #C9;
-static const field self::Strength NORMAL = #C12;
-static const field self::Strength WEAK_DEFAULT = #C15;
-static const field self::Strength WEAKEST = #C18;
-static const field core::int NONE = #C1;
-static const field core::int FORWARD = #C4;
-static const field core::int BACKWARD = #C20;
+static const field self::Strength REQUIRED = const self::Strength::•(0, "required");
+static const field self::Strength STRONG_PREFERRED = const self::Strength::•(1, "strongPreferred");
+static const field self::Strength PREFERRED = const self::Strength::•(2, "preferred");
+static const field self::Strength STRONG_DEFAULT = const self::Strength::•(3, "strongDefault");
+static const field self::Strength NORMAL = const self::Strength::•(4, "normal");
+static const field self::Strength WEAK_DEFAULT = const self::Strength::•(5, "weakDefault");
+static const field self::Strength WEAKEST = const self::Strength::•(6, "weakest");
+static const field core::int NONE = 1;
+static const field core::int FORWARD = 2;
+static const field core::int BACKWARD = 0;
 static field self::Planner planner;
 static method main() → dynamic {
   new self::DeltaBlue::•().{self::DeltaBlue::run}();
@@ -389,15 +389,15 @@ static method chainTest(core::int n) → void {
   for (core::int i = 0; i.{core::num::<=}(n); i = i.{core::num::+}(1)) {
     self::Variable v = new self::Variable::•("v${i}", 0);
     if(!prev.{core::Object::==}(null))
-      new self::EqualityConstraint::•(prev, v, #C22);
+      new self::EqualityConstraint::•(prev, v, self::REQUIRED);
     if(i.{core::num::==}(0))
       first = v;
     if(i.{core::num::==}(n))
       last = v;
     prev = v;
   }
-  new self::StayConstraint::•(last, #C9);
-  self::EditConstraint edit = new self::EditConstraint::•(first, #C6);
+  new self::StayConstraint::•(last, self::STRONG_DEFAULT);
+  self::EditConstraint edit = new self::EditConstraint::•(first, self::PREFERRED);
   self::Plan plan = self::planner.{self::Planner::extractPlanFromConstraints}(<self::Constraint>[edit]);
   for (core::int i = 0; i.{core::num::<}(100); i = i.{core::num::+}(1)) {
     first.{self::Variable::value} = i;
@@ -419,8 +419,8 @@ static method projectionTest(core::int n) → void {
     src = new self::Variable::•("src", i);
     dst = new self::Variable::•("dst", i);
     dests.{core::List::add}(dst);
-    new self::StayConstraint::•(src, #C12);
-    new self::ScaleConstraint::•(src, scale, offset, dst, #C22);
+    new self::StayConstraint::•(src, self::NORMAL);
+    new self::ScaleConstraint::•(src, scale, offset, dst, self::REQUIRED);
   }
   self::change(src, 17);
   if(!dst.{self::Variable::value}.{core::num::==}(1170))
@@ -440,7 +440,7 @@ static method projectionTest(core::int n) → void {
   }
 }
 static method change(self::Variable v, core::int newValue) → void {
-  self::EditConstraint edit = new self::EditConstraint::•(v, #C6);
+  self::EditConstraint edit = new self::EditConstraint::•(v, self::PREFERRED);
   self::Plan plan = self::planner.{self::Planner::extractPlanFromConstraints}(<self::EditConstraint>[edit]);
   for (core::int i = 0; i.{core::num::<}(10); i = i.{core::num::+}(1)) {
     v.{self::Variable::value} = newValue;
@@ -448,28 +448,3 @@ static method change(self::Variable v, core::int newValue) → void {
   }
   edit.{self::Constraint::destroyConstraint}();
 }
-
-constants  {
-  #C1 = 1
-  #C2 = "strongPreferred"
-  #C3 = self::Strength {value:#C1, name:#C2}
-  #C4 = 2
-  #C5 = "preferred"
-  #C6 = self::Strength {value:#C4, name:#C5}
-  #C7 = 3
-  #C8 = "strongDefault"
-  #C9 = self::Strength {value:#C7, name:#C8}
-  #C10 = 4
-  #C11 = "normal"
-  #C12 = self::Strength {value:#C10, name:#C11}
-  #C13 = 5
-  #C14 = "weakDefault"
-  #C15 = self::Strength {value:#C13, name:#C14}
-  #C16 = 6
-  #C17 = "weakest"
-  #C18 = self::Strength {value:#C16, name:#C17}
-  #C19 = <self::Strength>[#C3, #C6, #C9, #C12, #C15, #C18]
-  #C20 = 0
-  #C21 = "required"
-  #C22 = self::Strength {value:#C20, name:#C21}
-}

pkg/front_end/testcases/general/DeltaBlue.dart.strong.transformed.expect

@@ -18,7 +18,7 @@ class Strength extends core::Object {
     : self::Strength::value = value, self::Strength::name = name, super core::Object::•()
     ;
   method nextWeaker() → self::Strength
-    return (#C19).{core::List::[]}(this.{self::Strength::value});
+    return const <self::Strength>[self::STRONG_PREFERRED, self::PREFERRED, self::STRONG_DEFAULT, self::NORMAL, self::WEAK_DEFAULT, self::WEAKEST].{core::List::[]}(this.{self::Strength::value});
   static method stronger(self::Strength s1, self::Strength s2) → core::bool {
     return s1.{self::Strength::value}.{core::num::<}(s2.{self::Strength::value});
   }
@@ -54,7 +54,7 @@ abstract class Constraint extends core::Object {
   method satisfy(dynamic mark) → self::Constraint {
     this.{self::Constraint::chooseMethod}(mark as{TypeError} core::int);
     if(!this.{self::Constraint::isSatisfied}()) {
-      if(this.{self::Constraint::strength}.{core::Object::==}(#C22)) {
+      if(this.{self::Constraint::strength}.{core::Object::==}(self::REQUIRED)) {
         core::print("Could not satisfy a required constraint!");
       }
       return null;
@@ -131,39 +131,39 @@ class EditConstraint extends self::UnaryConstraint {
 abstract class BinaryConstraint extends self::Constraint {
   field self::Variable v1;
   field self::Variable v2;
-  field core::int direction = #C1;
+  field core::int direction = self::NONE;
   constructor •(self::Variable v1, self::Variable v2, self::Strength strength) → self::BinaryConstraint
     : self::BinaryConstraint::v1 = v1, self::BinaryConstraint::v2 = v2, super self::Constraint::•(strength) {
     this.{self::Constraint::addConstraint}();
   }
   method chooseMethod(core::int mark) → void {
     if(this.{self::BinaryConstraint::v1}.{self::Variable::mark}.{core::num::==}(mark)) {
-      this.{self::BinaryConstraint::direction} = !this.{self::BinaryConstraint::v2}.{self::Variable::mark}.{core::num::==}(mark) && self::Strength::stronger(this.{self::Constraint::strength}, this.{self::BinaryConstraint::v2}.{self::Variable::walkStrength}) ?{core::int} #C4 : #C1;
+      this.{self::BinaryConstraint::direction} = !this.{self::BinaryConstraint::v2}.{self::Variable::mark}.{core::num::==}(mark) && self::Strength::stronger(this.{self::Constraint::strength}, this.{self::BinaryConstraint::v2}.{self::Variable::walkStrength}) ?{core::int} self::FORWARD : self::NONE;
     }
     if(this.{self::BinaryConstraint::v2}.{self::Variable::mark}.{core::num::==}(mark)) {
-      this.{self::BinaryConstraint::direction} = !this.{self::BinaryConstraint::v1}.{self::Variable::mark}.{core::num::==}(mark) && self::Strength::stronger(this.{self::Constraint::strength}, this.{self::BinaryConstraint::v1}.{self::Variable::walkStrength}) ?{core::int} #C20 : #C1;
+      this.{self::BinaryConstraint::direction} = !this.{self::BinaryConstraint::v1}.{self::Variable::mark}.{core::num::==}(mark) && self::Strength::stronger(this.{self::Constraint::strength}, this.{self::BinaryConstraint::v1}.{self::Variable::walkStrength}) ?{core::int} self::BACKWARD : self::NONE;
     }
     if(self::Strength::weaker(this.{self::BinaryConstraint::v1}.{self::Variable::walkStrength}, this.{self::BinaryConstraint::v2}.{self::Variable::walkStrength})) {
-      this.{self::BinaryConstraint::direction} = self::Strength::stronger(this.{self::Constraint::strength}, this.{self::BinaryConstraint::v1}.{self::Variable::walkStrength}) ?{core::int} #C20 : #C1;
+      this.{self::BinaryConstraint::direction} = self::Strength::stronger(this.{self::Constraint::strength}, this.{self::BinaryConstraint::v1}.{self::Variable::walkStrength}) ?{core::int} self::BACKWARD : self::NONE;
     }
     else {
-      this.{self::BinaryConstraint::direction} = self::Strength::stronger(this.{self::Constraint::strength}, this.{self::BinaryConstraint::v2}.{self::Variable::walkStrength}) ?{core::int} #C4 : #C20;
+      this.{self::BinaryConstraint::direction} = self::Strength::stronger(this.{self::Constraint::strength}, this.{self::BinaryConstraint::v2}.{self::Variable::walkStrength}) ?{core::int} self::FORWARD : self::BACKWARD;
     }
   }
   method addToGraph() → void {
     this.{self::BinaryConstraint::v1}.{self::Variable::addConstraint}(this);
     this.{self::BinaryConstraint::v2}.{self::Variable::addConstraint}(this);
-    this.{self::BinaryConstraint::direction} = #C1;
+    this.{self::BinaryConstraint::direction} = self::NONE;
   }
   method isSatisfied() → core::bool
-    return !this.{self::BinaryConstraint::direction}.{core::num::==}(#C1);
+    return !this.{self::BinaryConstraint::direction}.{core::num::==}(self::NONE);
   method markInputs(core::int mark) → void {
     this.{self::BinaryConstraint::input}().{self::Variable::mark} = mark;
   }
   method input() → self::Variable
-    return this.{self::BinaryConstraint::direction}.{core::num::==}(#C4) ?{self::Variable} this.{self::BinaryConstraint::v1} : this.{self::BinaryConstraint::v2};
+    return this.{self::BinaryConstraint::direction}.{core::num::==}(self::FORWARD) ?{self::Variable} this.{self::BinaryConstraint::v1} : this.{self::BinaryConstraint::v2};
   method output() → self::Variable
-    return this.{self::BinaryConstraint::direction}.{core::num::==}(#C4) ?{self::Variable} this.{self::BinaryConstraint::v2} : this.{self::BinaryConstraint::v1};
+    return this.{self::BinaryConstraint::direction}.{core::num::==}(self::FORWARD) ?{self::Variable} this.{self::BinaryConstraint::v2} : this.{self::BinaryConstraint::v1};
   method recalculate() → void {
     self::Variable ihn = this.{self::BinaryConstraint::input}();
     self::Variable out = this.{self::BinaryConstraint::output}();
@@ -173,7 +173,7 @@ abstract class BinaryConstraint extends self::Constraint {
       this.{self::Constraint::execute}();
   }
   method markUnsatisfied() → void {
-    this.{self::BinaryConstraint::direction} = #C1;
+    this.{self::BinaryConstraint::direction} = self::NONE;
   }
   method inputsKnown(core::int mark) → core::bool {
     self::Variable i = this.{self::BinaryConstraint::input}();
@@ -184,7 +184,7 @@ abstract class BinaryConstraint extends self::Constraint {
       this.{self::BinaryConstraint::v1}.{self::Variable::removeConstraint}(this);
     if(!this.{self::BinaryConstraint::v2}.{core::Object::==}(null))
       this.{self::BinaryConstraint::v2}.{self::Variable::removeConstraint}(this);
-    this.{self::BinaryConstraint::direction} = #C1;
+    this.{self::BinaryConstraint::direction} = self::NONE;
   }
 }
 class ScaleConstraint extends self::BinaryConstraint {
@@ -210,7 +210,7 @@ class ScaleConstraint extends self::BinaryConstraint {
     this.{self::ScaleConstraint::scale}.{self::Variable::mark} = this.{self::ScaleConstraint::offset}.{self::Variable::mark} = mark;
   }
   method execute() → void {
-    if(this.{self::BinaryConstraint::direction}.{core::num::==}(#C4)) {
+    if(this.{self::BinaryConstraint::direction}.{core::num::==}(self::FORWARD)) {
       this.{self::BinaryConstraint::v2}.{self::Variable::value} = this.{self::BinaryConstraint::v1}.{self::Variable::value}.{core::num::*}(this.{self::ScaleConstraint::scale}.{self::Variable::value}).{core::num::+}(this.{self::ScaleConstraint::offset}.{self::Variable::value});
     }
     else {
@@ -238,7 +238,7 @@ class Variable extends core::Object {
   field core::List<self::Constraint> constraints = <self::Constraint>[];
   field self::Constraint determinedBy = null;
   field core::int mark = 0;
-  field self::Strength walkStrength = #C18;
+  field self::Strength walkStrength = self::WEAKEST;
   field core::bool stay = true;
   field core::int value;
   final field core::String name;
@@ -269,7 +269,7 @@ class Planner extends core::Object {
     c.{self::Constraint::markUnsatisfied}();
     c.{self::Constraint::removeFromGraph}();
     core::List<self::Constraint> unsatisfied = this.{self::Planner::removePropagateFrom}(out);
-    self::Strength strength = #C22;
+    self::Strength strength = self::REQUIRED;
     do {
       for (core::int i = 0; i.{core::num::<}(unsatisfied.{core::List::length}); i = i.{core::num::+}(1)) {
         self::Constraint u = unsatisfied.{core::List::[]}(i);
@@ -278,7 +278,7 @@ class Planner extends core::Object {
       }
       strength = strength.{self::Strength::nextWeaker}();
     }
-    while (!strength.{core::Object::==}(#C18))
+    while (!strength.{core::Object::==}(self::WEAKEST))
   }
   method newMark() → core::int
     return this.{self::Planner::currentMark} = this.{self::Planner::currentMark}.{core::num::+}(1);
@@ -320,7 +320,7 @@ class Planner extends core::Object {
   }
   method removePropagateFrom(self::Variable out) → core::List<self::Constraint> {
     out.{self::Variable::determinedBy} = null;
-    out.{self::Variable::walkStrength} = #C18;
+    out.{self::Variable::walkStrength} = self::WEAKEST;
     out.{self::Variable::stay} = true;
     core::List<self::Constraint> unsatisfied = <self::Constraint>[];
     core::List<self::Variable> todo = <self::Variable>[out];
@@ -367,16 +367,16 @@ class Plan extends core::Object {
     }
   }
 }
-static const field self::Strength REQUIRED = #C22;
-static const field self::Strength STRONG_PREFERRED = #C3;
-static const field self::Strength PREFERRED = #C6;
-static const field self::Strength STRONG_DEFAULT = #C9;
-static const field self::Strength NORMAL = #C12;
-static const field self::Strength WEAK_DEFAULT = #C15;
-static const field self::Strength WEAKEST = #C18;
-static const field core::int NONE = #C1;
-static const field core::int FORWARD = #C4;
-static const field core::int BACKWARD = #C20;
+static const field self::Strength REQUIRED = const self::Strength::•(0, "required");
+static const field self::Strength STRONG_PREFERRED = const self::Strength::•(1, "strongPreferred");
+static const field self::Strength PREFERRED = const self::Strength::•(2, "preferred");
+static const field self::Strength STRONG_DEFAULT = const self::Strength::•(3, "strongDefault");
+static const field self::Strength NORMAL = const self::Strength::•(4, "normal");
+static const field self::Strength WEAK_DEFAULT = const self::Strength::•(5, "weakDefault");
+static const field self::Strength WEAKEST = const self::Strength::•(6, "weakest");
+static const field core::int NONE = 1;
+static const field core::int FORWARD = 2;
+static const field core::int BACKWARD = 0;
 static field self::Planner planner;
 static method main() → dynamic {
   new self::DeltaBlue::•().{self::DeltaBlue::run}();
@@ -389,15 +389,15 @@ static method chainTest(core::int n) → void {
   for (core::int i = 0; i.{core::num::<=}(n); i = i.{core::num::+}(1)) {
     self::Variable v = new self::Variable::•("v${i}", 0);
     if(!prev.{core::Object::==}(null))
-      new self::EqualityConstraint::•(prev, v, #C22);
+      new self::EqualityConstraint::•(prev, v, self::REQUIRED);
     if(i.{core::num::==}(0))
       first = v;
     if(i.{core::num::==}(n))
       last = v;
     prev = v;
   }
-  new self::StayConstraint::•(last, #C9);
-  self::EditConstraint edit = new self::EditConstraint::•(first, #C6);
+  new self::StayConstraint::•(last, self::STRONG_DEFAULT);
+  self::EditConstraint edit = new self::EditConstraint::•(first, self::PREFERRED);
   self::Plan plan = self::planner.{self::Planner::extractPlanFromConstraints}(<self::Constraint>[edit]);
   for (core::int i = 0; i.{core::num::<}(100); i = i.{core::num::+}(1)) {
     first.{self::Variable::value} = i;
@@ -419,8 +419,8 @@ static method projectionTest(core::int n) → void {
     src = new self::Variable::•("src", i);
     dst = new self::Variable::•("dst", i);
     dests.{core::List::add}(dst);
-    new self::StayConstraint::•(src, #C12);
-    new self::ScaleConstraint::•(src, scale, offset, dst, #C22);
+    new self::StayConstraint::•(src, self::NORMAL);
+    new self::ScaleConstraint::•(src, scale, offset, dst, self::REQUIRED);
   }
   self::change(src, 17);
   if(!dst.{self::Variable::value}.{core::num::==}(1170))
@@ -440,7 +440,7 @@ static method projectionTest(core::int n) → void {
   }
 }
 static method change(self::Variable v, core::int newValue) → void {
-  self::EditConstraint edit = new self::EditConstraint::•(v, #C6);
+  self::EditConstraint edit = new self::EditConstraint::•(v, self::PREFERRED);
   self::Plan plan = self::planner.{self::Planner::extractPlanFromConstraints}(<self::EditConstraint>[edit]);
   for (core::int i = 0; i.{core::num::<}(10); i = i.{core::num::+}(1)) {
     v.{self::Variable::value} = newValue;
@@ -448,28 +448,3 @@ static method change(self::Variable v, core::int newValue) → void {
   }
   edit.{self::Constraint::destroyConstraint}();
 }
-
-constants  {
-  #C1 = 1
-  #C2 = "strongPreferred"
-  #C3 = self::Strength {value:#C1, name:#C2}
-  #C4 = 2
-  #C5 = "preferred"
-  #C6 = self::Strength {value:#C4, name:#C5}
-  #C7 = 3
-  #C8 = "strongDefault"
-  #C9 = self::Strength {value:#C7, name:#C8}
-  #C10 = 4
-  #C11 = "normal"
-  #C12 = self::Strength {value:#C10, name:#C11}
-  #C13 = 5
-  #C14 = "weakDefault"
-  #C15 = self::Strength {value:#C13, name:#C14}
-  #C16 = 6
-  #C17 = "weakest"
-  #C18 = self::Strength {value:#C16, name:#C17}
-  #C19 = <self::Strength>[#C3, #C6, #C9, #C12, #C15, #C18]
-  #C20 = 0
-  #C21 = "required"
-  #C22 = self::Strength {value:#C20, name:#C21}
-}

pkg/front_end/testcases/general/abstract_members.dart.legacy.expect

@@ -182,13 +182,13 @@ class MyClass extends self::B {
   method bMethod() → dynamic {}
   method cMethod() → dynamic {}
   no-such-method-forwarder get interfaceMethod1() → dynamic
-    return this.{core::Object::noSuchMethod}(new core::_InvocationMirror::_withType(#C1, 1, #C2, #C3, core::Map::unmodifiable<core::Symbol, dynamic>(#C4))) as{TypeError} dynamic;
+    return this.{core::Object::noSuchMethod}(new core::_InvocationMirror::_withType(#interfaceMethod1, 1, const <core::Type>[], const <dynamic>[], core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{}))) as{TypeError} dynamic;
   no-such-method-forwarder set property3(dynamic _) → void
-    return this.{core::Object::noSuchMethod}(new core::_InvocationMirror::_withType(#C5, 2, #C2, core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+    return this.{core::Object::noSuchMethod}(new core::_InvocationMirror::_withType(#property3=, 2, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
   no-such-method-forwarder set interfaceMethod1(dynamic value) → void
-    return this.{core::Object::noSuchMethod}(new core::_InvocationMirror::_withType(#C6, 2, #C2, core::List::unmodifiable<dynamic>(<dynamic>[value]), core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+    return this.{core::Object::noSuchMethod}(new core::_InvocationMirror::_withType(#interfaceMethod1=, 2, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>[value]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
   no-such-method-forwarder set property1(dynamic _) → void
-    return this.{core::Object::noSuchMethod}(new core::_InvocationMirror::_withType(#C7, 2, #C2, core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+    return this.{core::Object::noSuchMethod}(new core::_InvocationMirror::_withType(#property1=, 2, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
 }
 class MyMock1 extends self::B {
   synthetic constructor •() → self::MyMock1
@@ -197,21 +197,21 @@ class MyMock1 extends self::B {
   method noSuchMethod(core::Invocation _) → dynamic
     return null;
   no-such-method-forwarder method interfaceMethod2() → void
-    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#C8, 0, #C2, #C3, core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#interfaceMethod2, 0, const <core::Type>[], const <dynamic>[], core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
   no-such-method-forwarder method abstractMethod() → dynamic
-    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#C9, 0, #C2, #C3, core::Map::unmodifiable<core::Symbol, dynamic>(#C4))) as{TypeError} dynamic;
+    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#abstractMethod, 0, const <core::Type>[], const <dynamic>[], core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{}))) as{TypeError} dynamic;
   no-such-method-forwarder method interfaceMethod1() → void
-    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#C1, 0, #C2, #C3, core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#interfaceMethod1, 0, const <core::Type>[], const <dynamic>[], core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
   no-such-method-forwarder method interfaceMethod3() → void
-    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#C10, 0, #C2, #C3, core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#interfaceMethod3, 0, const <core::Type>[], const <dynamic>[], core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
   no-such-method-forwarder set property3(dynamic _) → void
-    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#C5, 2, #C2, core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#property3=, 2, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
   no-such-method-forwarder set interfaceMethod1(dynamic value) → void
-    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#C6, 2, #C2, core::List::unmodifiable<dynamic>(<dynamic>[value]), core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#interfaceMethod1=, 2, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>[value]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
   no-such-method-forwarder set property1(dynamic _) → void
-    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#C7, 2, #C2, core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#property1=, 2, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
   no-such-method-forwarder set property2(dynamic _) → void
-    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#C11, 2, #C2, core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#property2=, 2, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
 }
 class MyMock2 extends self::MyMock1 {
   synthetic constructor •() → self::MyMock2
@@ -225,15 +225,15 @@ class MyMock3 extends self::B {
     ;
   abstract method noSuchMethod(core::Invocation _) → dynamic;
   no-such-method-forwarder get interfaceMethod1() → dynamic
-    return this.{self::MyMock3::noSuchMethod}(new core::_InvocationMirror::_withType(#C1, 1, #C2, #C3, core::Map::unmodifiable<core::Symbol, dynamic>(#C4))) as{TypeError} dynamic;
+    return this.{self::MyMock3::noSuchMethod}(new core::_InvocationMirror::_withType(#interfaceMethod1, 1, const <core::Type>[], const <dynamic>[], core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{}))) as{TypeError} dynamic;
   no-such-method-forwarder set property3(dynamic _) → void
-    return this.{self::MyMock3::noSuchMethod}(new core::_InvocationMirror::_withType(#C5, 2, #C2, core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+    return this.{self::MyMock3::noSuchMethod}(new core::_InvocationMirror::_withType(#property3=, 2, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
   no-such-method-forwarder set interfaceMethod1(dynamic value) → void
-    return this.{self::MyMock3::noSuchMethod}(new core::_InvocationMirror::_withType(#C6, 2, #C2, core::List::unmodifiable<dynamic>(<dynamic>[value]), core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+    return this.{self::MyMock3::noSuchMethod}(new core::_InvocationMirror::_withType(#interfaceMethod1=, 2, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>[value]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
   no-such-method-forwarder set property1(dynamic _) → void
-    return this.{self::MyMock3::noSuchMethod}(new core::_InvocationMirror::_withType(#C7, 2, #C2, core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+    return this.{self::MyMock3::noSuchMethod}(new core::_InvocationMirror::_withType(#property1=, 2, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
   no-such-method-forwarder set property2(dynamic _) → void
-    return this.{self::MyMock3::noSuchMethod}(new core::_InvocationMirror::_withType(#C11, 2, #C2, core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+    return this.{self::MyMock3::noSuchMethod}(new core::_InvocationMirror::_withType(#property2=, 2, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
 }
 class C extends core::Object {
   synthetic constructor •() → self::C
@@ -294,17 +294,3 @@ abstract class J extends self::I implements self::Bar {
     ;
 }
 static method main() → dynamic {}
-
-constants  {
-  #C1 = #interfaceMethod1
-  #C2 = <core::Type>[]
-  #C3 = <dynamic>[]
-  #C4 = core::_ImmutableMap<core::Symbol, dynamic> {_kvPairs:#C3}
-  #C5 = #property3=
-  #C6 = #interfaceMethod1=
-  #C7 = #property1=
-  #C8 = #interfaceMethod2
-  #C9 = #abstractMethod
-  #C10 = #interfaceMethod3
-  #C11 = #property2=
-}

pkg/front_end/testcases/general/abstract_members.dart.legacy.transformed.expect

@@ -182,13 +182,13 @@ class MyClass extends self::B {
   method bMethod() → dynamic {}
   method cMethod() → dynamic {}
   no-such-method-forwarder get interfaceMethod1() → dynamic
-    return this.{core::Object::noSuchMethod}(new core::_InvocationMirror::_withType(#C1, 1, #C2, #C3, core::Map::unmodifiable<core::Symbol, dynamic>(#C4))) as{TypeError} dynamic;
+    return this.{core::Object::noSuchMethod}(new core::_InvocationMirror::_withType(#interfaceMethod1, 1, const <core::Type>[], const <dynamic>[], core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{}))) as{TypeError} dynamic;
   no-such-method-forwarder set property3(dynamic _) → void
-    return this.{core::Object::noSuchMethod}(new core::_InvocationMirror::_withType(#C5, 2, #C2, core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+    return this.{core::Object::noSuchMethod}(new core::_InvocationMirror::_withType(#property3=, 2, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
   no-such-method-forwarder set interfaceMethod1(dynamic value) → void
-    return this.{core::Object::noSuchMethod}(new core::_InvocationMirror::_withType(#C6, 2, #C2, core::List::unmodifiable<dynamic>(<dynamic>[value]), core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+    return this.{core::Object::noSuchMethod}(new core::_InvocationMirror::_withType(#interfaceMethod1=, 2, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>[value]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
   no-such-method-forwarder set property1(dynamic _) → void
-    return this.{core::Object::noSuchMethod}(new core::_InvocationMirror::_withType(#C7, 2, #C2, core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+    return this.{core::Object::noSuchMethod}(new core::_InvocationMirror::_withType(#property1=, 2, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
 }
 class MyMock1 extends self::B {
   synthetic constructor •() → self::MyMock1
@@ -197,21 +197,21 @@ class MyMock1 extends self::B {
   method noSuchMethod(core::Invocation _) → dynamic
     return null;
   no-such-method-forwarder method interfaceMethod2() → void
-    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#C8, 0, #C2, #C3, core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#interfaceMethod2, 0, const <core::Type>[], const <dynamic>[], core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
   no-such-method-forwarder method abstractMethod() → dynamic
-    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#C9, 0, #C2, #C3, core::Map::unmodifiable<core::Symbol, dynamic>(#C4))) as{TypeError} dynamic;
+    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#abstractMethod, 0, const <core::Type>[], const <dynamic>[], core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{}))) as{TypeError} dynamic;
   no-such-method-forwarder method interfaceMethod1() → void
-    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#C1, 0, #C2, #C3, core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#interfaceMethod1, 0, const <core::Type>[], const <dynamic>[], core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
   no-such-method-forwarder method interfaceMethod3() → void
-    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#C10, 0, #C2, #C3, core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#interfaceMethod3, 0, const <core::Type>[], const <dynamic>[], core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
   no-such-method-forwarder set property3(dynamic _) → void
-    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#C5, 2, #C2, core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#property3=, 2, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
   no-such-method-forwarder set interfaceMethod1(dynamic value) → void
-    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#C6, 2, #C2, core::List::unmodifiable<dynamic>(<dynamic>[value]), core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#interfaceMethod1=, 2, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>[value]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
   no-such-method-forwarder set property1(dynamic _) → void
-    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#C7, 2, #C2, core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#property1=, 2, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
   no-such-method-forwarder set property2(dynamic _) → void
-    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#C11, 2, #C2, core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#property2=, 2, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
 }
 class MyMock2 extends self::MyMock1 {
   synthetic constructor •() → self::MyMock2
@@ -225,15 +225,15 @@ class MyMock3 extends self::B {
     ;
   abstract method noSuchMethod(core::Invocation _) → dynamic;
   no-such-method-forwarder get interfaceMethod1() → dynamic
-    return this.{self::MyMock3::noSuchMethod}(new core::_InvocationMirror::_withType(#C1, 1, #C2, #C3, core::Map::unmodifiable<core::Symbol, dynamic>(#C4))) as{TypeError} dynamic;
+    return this.{self::MyMock3::noSuchMethod}(new core::_InvocationMirror::_withType(#interfaceMethod1, 1, const <core::Type>[], const <dynamic>[], core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{}))) as{TypeError} dynamic;
   no-such-method-forwarder set property3(dynamic _) → void
-    return this.{self::MyMock3::noSuchMethod}(new core::_InvocationMirror::_withType(#C5, 2, #C2, core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+    return this.{self::MyMock3::noSuchMethod}(new core::_InvocationMirror::_withType(#property3=, 2, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
   no-such-method-forwarder set interfaceMethod1(dynamic value) → void
-    return this.{self::MyMock3::noSuchMethod}(new core::_InvocationMirror::_withType(#C6, 2, #C2, core::List::unmodifiable<dynamic>(<dynamic>[value]), core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+    return this.{self::MyMock3::noSuchMethod}(new core::_InvocationMirror::_withType(#interfaceMethod1=, 2, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>[value]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
   no-such-method-forwarder set property1(dynamic _) → void
-    return this.{self::MyMock3::noSuchMethod}(new core::_InvocationMirror::_withType(#C7, 2, #C2, core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+    return this.{self::MyMock3::noSuchMethod}(new core::_InvocationMirror::_withType(#property1=, 2, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
   no-such-method-forwarder set property2(dynamic _) → void
-    return this.{self::MyMock3::noSuchMethod}(new core::_InvocationMirror::_withType(#C11, 2, #C2, core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+    return this.{self::MyMock3::noSuchMethod}(new core::_InvocationMirror::_withType(#property2=, 2, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
 }
 class C extends core::Object {
   synthetic constructor •() → self::C
@@ -294,17 +294,3 @@ abstract class J extends self::I implements self::Bar {
     ;
 }
 static method main() → dynamic {}
-
-constants  {
-  #C1 = #interfaceMethod1
-  #C2 = <core::Type>[]
-  #C3 = <dynamic>[]
-  #C4 = core::_ImmutableMap<core::Symbol, dynamic> {_kvPairs:#C3}
-  #C5 = #property3=
-  #C6 = #interfaceMethod1=
-  #C7 = #property1=
-  #C8 = #interfaceMethod2
-  #C9 = #abstractMethod
-  #C10 = #interfaceMethod3
-  #C11 = #property2=
-}

pkg/front_end/testcases/general/abstract_members.dart.strong.expect

@@ -182,13 +182,13 @@ class MyClass extends self::B {
   method bMethod() → dynamic {}
   method cMethod() → dynamic {}
   no-such-method-forwarder get interfaceMethod1() → dynamic
-    return this.{core::Object::noSuchMethod}(new core::_InvocationMirror::_withType(#C1, 1, #C2, #C3, core::Map::unmodifiable<core::Symbol, dynamic>(#C4))) as{TypeError} dynamic;
+    return this.{core::Object::noSuchMethod}(new core::_InvocationMirror::_withType(#interfaceMethod1, 1, const <core::Type>[], const <dynamic>[], core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{}))) as{TypeError} dynamic;
   no-such-method-forwarder set property3(dynamic _) → void
-    return this.{core::Object::noSuchMethod}(new core::_InvocationMirror::_withType(#C5, 2, #C2, core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+    return this.{core::Object::noSuchMethod}(new core::_InvocationMirror::_withType(#property3=, 2, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
   no-such-method-forwarder set interfaceMethod1(dynamic value) → void
-    return this.{core::Object::noSuchMethod}(new core::_InvocationMirror::_withType(#C6, 2, #C2, core::List::unmodifiable<dynamic>(<dynamic>[value]), core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+    return this.{core::Object::noSuchMethod}(new core::_InvocationMirror::_withType(#interfaceMethod1=, 2, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>[value]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
   no-such-method-forwarder set property1(dynamic _) → void
-    return this.{core::Object::noSuchMethod}(new core::_InvocationMirror::_withType(#C7, 2, #C2, core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+    return this.{core::Object::noSuchMethod}(new core::_InvocationMirror::_withType(#property1=, 2, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
 }
 class MyMock1 extends self::B {
   synthetic constructor •() → self::MyMock1
@@ -197,21 +197,21 @@ class MyMock1 extends self::B {
   method noSuchMethod(core::Invocation _) → dynamic
     return null;
   no-such-method-forwarder method interfaceMethod2() → void
-    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#C8, 0, #C2, #C3, core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#interfaceMethod2, 0, const <core::Type>[], const <dynamic>[], core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
   no-such-method-forwarder method abstractMethod() → dynamic
-    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#C9, 0, #C2, #C3, core::Map::unmodifiable<core::Symbol, dynamic>(#C4))) as{TypeError} dynamic;
+    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#abstractMethod, 0, const <core::Type>[], const <dynamic>[], core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{}))) as{TypeError} dynamic;
   no-such-method-forwarder method interfaceMethod1() → void
-    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#C1, 0, #C2, #C3, core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#interfaceMethod1, 0, const <core::Type>[], const <dynamic>[], core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
   no-such-method-forwarder method interfaceMethod3() → void
-    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#C10, 0, #C2, #C3, core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#interfaceMethod3, 0, const <core::Type>[], const <dynamic>[], core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
   no-such-method-forwarder set property3(dynamic _) → void
-    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#C5, 2, #C2, core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#property3=, 2, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
   no-such-method-forwarder set interfaceMethod1(dynamic value) → void
-    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#C6, 2, #C2, core::List::unmodifiable<dynamic>(<dynamic>[value]), core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#interfaceMethod1=, 2, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>[value]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
   no-such-method-forwarder set property1(dynamic _) → void
-    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#C7, 2, #C2, core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#property1=, 2, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
   no-such-method-forwarder set property2(dynamic _) → void
-    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#C11, 2, #C2, core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#property2=, 2, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
 }
 class MyMock2 extends self::MyMock1 {
   synthetic constructor •() → self::MyMock2
@@ -225,15 +225,15 @@ class MyMock3 extends self::B {
     ;
   abstract method noSuchMethod(core::Invocation _) → dynamic;
   no-such-method-forwarder get interfaceMethod1() → dynamic
-    return this.{self::MyMock3::noSuchMethod}(new core::_InvocationMirror::_withType(#C1, 1, #C2, #C3, core::Map::unmodifiable<core::Symbol, dynamic>(#C4))) as{TypeError} dynamic;
+    return this.{self::MyMock3::noSuchMethod}(new core::_InvocationMirror::_withType(#interfaceMethod1, 1, const <core::Type>[], const <dynamic>[], core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{}))) as{TypeError} dynamic;
   no-such-method-forwarder set property3(dynamic _) → void
-    return this.{self::MyMock3::noSuchMethod}(new core::_InvocationMirror::_withType(#C5, 2, #C2, core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+    return this.{self::MyMock3::noSuchMethod}(new core::_InvocationMirror::_withType(#property3=, 2, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
   no-such-method-forwarder set interfaceMethod1(dynamic value) → void
-    return this.{self::MyMock3::noSuchMethod}(new core::_InvocationMirror::_withType(#C6, 2, #C2, core::List::unmodifiable<dynamic>(<dynamic>[value]), core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+    return this.{self::MyMock3::noSuchMethod}(new core::_InvocationMirror::_withType(#interfaceMethod1=, 2, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>[value]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
   no-such-method-forwarder set property1(dynamic _) → void
-    return this.{self::MyMock3::noSuchMethod}(new core::_InvocationMirror::_withType(#C7, 2, #C2, core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+    return this.{self::MyMock3::noSuchMethod}(new core::_InvocationMirror::_withType(#property1=, 2, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
   no-such-method-forwarder set property2(dynamic _) → void
-    return this.{self::MyMock3::noSuchMethod}(new core::_InvocationMirror::_withType(#C11, 2, #C2, core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+    return this.{self::MyMock3::noSuchMethod}(new core::_InvocationMirror::_withType(#property2=, 2, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
 }
 class C extends core::Object {
   synthetic constructor •() → self::C
@@ -294,17 +294,3 @@ abstract class J extends self::I implements self::Bar {
     ;
 }
 static method main() → dynamic {}
-
-constants  {
-  #C1 = #interfaceMethod1
-  #C2 = <core::Type>[]
-  #C3 = <dynamic>[]
-  #C4 = core::_ImmutableMap<core::Symbol, dynamic> {_kvPairs:#C3}
-  #C5 = #property3=
-  #C6 = #interfaceMethod1=
-  #C7 = #property1=
-  #C8 = #interfaceMethod2
-  #C9 = #abstractMethod
-  #C10 = #interfaceMethod3
-  #C11 = #property2=
-}

pkg/front_end/testcases/general/abstract_overrides_concrete_with_no_such_method.dart.legacy.expect

@@ -27,13 +27,6 @@ class D extends self::C implements self::B {
     : super self::C::•()
     ;
   no-such-method-forwarder method foo() → self::B
-    return this.{self::C::noSuchMethod}(new core::_InvocationMirror::_withType(#C1, 0, #C2, #C3, core::Map::unmodifiable<core::Symbol, dynamic>(#C4))) as{TypeError} self::B;
+    return this.{self::C::noSuchMethod}(new core::_InvocationMirror::_withType(#foo, 0, const <core::Type>[], const <dynamic>[], core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{}))) as{TypeError} self::B;
 }
 static method main() → dynamic {}
-
-constants  {
-  #C1 = #foo
-  #C2 = <core::Type>[]
-  #C3 = <dynamic>[]
-  #C4 = core::_ImmutableMap<core::Symbol, dynamic> {_kvPairs:#C3}
-}

pkg/front_end/testcases/general/abstract_overrides_concrete_with_no_such_method.dart.legacy.transformed.expect

@@ -27,13 +27,6 @@ class D extends self::C implements self::B {
     : super self::C::•()
     ;
   no-such-method-forwarder method foo() → self::B
-    return this.{self::C::noSuchMethod}(new core::_InvocationMirror::_withType(#C1, 0, #C2, #C3, core::Map::unmodifiable<core::Symbol, dynamic>(#C4))) as{TypeError} self::B;
+    return this.{self::C::noSuchMethod}(new core::_InvocationMirror::_withType(#foo, 0, const <core::Type>[], const <dynamic>[], core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{}))) as{TypeError} self::B;
 }
 static method main() → dynamic {}
-
-constants  {
-  #C1 = #foo
-  #C2 = <core::Type>[]
-  #C3 = <dynamic>[]
-  #C4 = core::_ImmutableMap<core::Symbol, dynamic> {_kvPairs:#C3}
-}

pkg/front_end/testcases/general/abstract_overrides_concrete_with_no_such_method.dart.strong.expect

@@ -27,13 +27,6 @@ class D extends self::C implements self::B {
     : super self::C::•()
     ;
   no-such-method-forwarder method foo() → self::B
-    return this.{self::C::noSuchMethod}(new core::_InvocationMirror::_withType(#C1, 0, #C2, #C3, core::Map::unmodifiable<core::Symbol, dynamic>(#C4))) as{TypeError} self::B;
+    return this.{self::C::noSuchMethod}(new core::_InvocationMirror::_withType(#foo, 0, const <core::Type>[], const <dynamic>[], core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{}))) as{TypeError} self::B;
 }
 static method main() → dynamic {}
-
-constants  {
-  #C1 = #foo
-  #C2 = <core::Type>[]
-  #C3 = <dynamic>[]
-  #C4 = core::_ImmutableMap<core::Symbol, dynamic> {_kvPairs:#C3}
-}

pkg/front_end/testcases/general/abstract_overrides_concrete_with_no_such_method.dart.strong.transformed.expect

@@ -27,13 +27,6 @@ class D extends self::C implements self::B {
     : super self::C::•()
     ;
   no-such-method-forwarder method foo() → self::B
-    return this.{self::C::noSuchMethod}(new core::_InvocationMirror::_withType(#C1, 0, #C2, #C3, core::Map::unmodifiable<core::Symbol, dynamic>(#C4))) as{TypeError} self::B;
+    return this.{self::C::noSuchMethod}(new core::_InvocationMirror::_withType(#foo, 0, const <core::Type>[], const <dynamic>[], core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{}))) as{TypeError} self::B;
 }
 static method main() → dynamic {}
-
-constants  {
-  #C1 = #foo
-  #C2 = <core::Type>[]
-  #C3 = <dynamic>[]
-  #C4 = core::_ImmutableMap<core::Symbol, dynamic> {_kvPairs:#C3}
-}

pkg/front_end/testcases/general/accessors.dart.legacy.expect

@@ -54,7 +54,7 @@ static set onlySetter(dynamic value) → void {
 }
 static method main() → dynamic {
   try {
-    core::print(throw new core::NoSuchMethodError::withInvocation(null, new core::_InvocationMirror::_withType(#C1, 33, #C2, #C3, core::Map::unmodifiable<core::Symbol, dynamic>(#C4))));
+    core::print(throw new core::NoSuchMethodError::withInvocation(null, new core::_InvocationMirror::_withType(#onlySetter, 33, const <core::Type>[], const <dynamic>[], core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{}))));
     throw "No error thrown";
   }
   on core::NoSuchMethodError catch(final core::NoSuchMethodError e) {
@@ -64,10 +64,3 @@ static method main() → dynamic {
   new self::C::•().testC();
   new self::D::•().testD();
 }
-
-constants  {
-  #C1 = #onlySetter
-  #C2 = <core::Type>[]
-  #C3 = <dynamic>[]
-  #C4 = core::_ImmutableMap<core::Symbol, dynamic> {_kvPairs:#C3}
-}

pkg/front_end/testcases/general/accessors.dart.legacy.transformed.expect

@@ -54,7 +54,7 @@ static set onlySetter(dynamic value) → void {
 }
 static method main() → dynamic {
   try {
-    core::print(throw new core::NoSuchMethodError::withInvocation(null, new core::_InvocationMirror::_withType(#C1, 33, #C2, #C3, core::Map::unmodifiable<core::Symbol, dynamic>(#C4))));
+    core::print(throw new core::NoSuchMethodError::withInvocation(null, new core::_InvocationMirror::_withType(#onlySetter, 33, const <core::Type>[], const <dynamic>[], core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{}))));
     throw "No error thrown";
   }
   on core::NoSuchMethodError catch(final core::NoSuchMethodError e) {
@@ -64,10 +64,3 @@ static method main() → dynamic {
   new self::C::•().testC();
   new self::D::•().testD();
 }
-
-constants  {
-  #C1 = #onlySetter
-  #C2 = <core::Type>[]
-  #C3 = <dynamic>[]
-  #C4 = core::_ImmutableMap<core::Symbol, dynamic> {_kvPairs:#C3}
-}

pkg/front_end/testcases/general/ambiguous_exports.dart.legacy.expect

@@ -7,12 +7,11 @@ library;
 // ^
 //
 import self as self;
-import "dart:core" as core;
 
 export "org-dartlang-testcase:///hello.dart";
 export "org-dartlang-testcase:///map.dart";
 
-static const field dynamic _exports# = #C1 /* from null */;
+static const field dynamic _exports# = "{\"main\":\"'main' is exported from both 'pkg/front_end/testcases/general/hello.dart' and 'pkg/front_end/testcases/general/map.dart'.\"}" /* from null */;
 
 library;
 import self as self2;
@@ -29,7 +28,3 @@ import "dart:core" as core;
 static method main() → dynamic {
   core::print(core::Map::•<dynamic, dynamic>());
 }
-
-constants  {
-  #C1 = "{\"main\":\"'main' is exported from both 'pkg/front_end/testcases/general/hello.dart' and 'pkg/front_end/testcases/general/map.dart'.\"}"
-}

pkg/front_end/testcases/general/ambiguous_exports.dart.legacy.transformed.expect

@@ -7,12 +7,11 @@ library;
 // ^
 //
 import self as self;
-import "dart:core" as core;
 
 export "org-dartlang-testcase:///hello.dart";
 export "org-dartlang-testcase:///map.dart";
 
-static const field dynamic _exports# = #C1 /* from null */;
+static const field dynamic _exports# = "{\"main\":\"'main' is exported from both 'pkg/front_end/testcases/general/hello.dart' and 'pkg/front_end/testcases/general/map.dart'.\"}" /* from null */;
 
 library;
 import self as self2;
@@ -29,7 +28,3 @@ import "dart:core" as core;
 static method main() → dynamic {
   core::print(core::Map::•<dynamic, dynamic>());
 }
-
-constants  {
-  #C1 = "{\"main\":\"'main' is exported from both 'pkg/front_end/testcases/general/hello.dart' and 'pkg/front_end/testcases/general/map.dart'.\"}"
-}

pkg/front_end/testcases/general/ambiguous_exports.dart.strong.expect

@@ -7,12 +7,11 @@ library;
 // ^
 //
 import self as self;
-import "dart:core" as core;
 
 export "org-dartlang-testcase:///hello.dart";
 export "org-dartlang-testcase:///map.dart";
 
-static const field dynamic _exports# = #C1 /* from null */;
+static const field dynamic _exports# = "{\"main\":\"'main' is exported from both 'pkg/front_end/testcases/general/hello.dart' and 'pkg/front_end/testcases/general/map.dart'.\"}" /* from null */;
 
 library;
 import self as self2;
@@ -29,7 +28,3 @@ import "dart:core" as core;
 static method main() → dynamic {
   core::print(core::Map::•<dynamic, dynamic>());
 }
-
-constants  {
-  #C1 = "{\"main\":\"'main' is exported from both 'pkg/front_end/testcases/general/hello.dart' and 'pkg/front_end/testcases/general/map.dart'.\"}"
-}

pkg/front_end/testcases/general/ambiguous_exports.dart.strong.transformed.expect

@@ -7,12 +7,11 @@ library;
 // ^
 //
 import self as self;
-import "dart:core" as core;
 
 export "org-dartlang-testcase:///hello.dart";
 export "org-dartlang-testcase:///map.dart";
 
-static const field dynamic _exports# = #C1 /* from null */;
+static const field dynamic _exports# = "{\"main\":\"'main' is exported from both 'pkg/front_end/testcases/general/hello.dart' and 'pkg/front_end/testcases/general/map.dart'.\"}" /* from null */;
 
 library;
 import self as self2;
@@ -29,7 +28,3 @@ import "dart:core" as core;
 static method main() → dynamic {
   core::print(core::Map::•<dynamic, dynamic>());
 }
-
-constants  {
-  #C1 = "{\"main\":\"'main' is exported from both 'pkg/front_end/testcases/general/hello.dart' and 'pkg/front_end/testcases/general/map.dart'.\"}"
-}

pkg/front_end/testcases/general/annotation_on_enum_values.dart.legacy.expect

@@ -11,32 +11,17 @@ class Fisk<T extends core::Object = dynamic> extends core::Object {
 class Foo extends core::Object {
   final field core::int index;
   final field core::String _name;
-  static const field core::List<self::Foo> values = #C10;
-  @#C11
-  static const field self::Foo bar = #C3;
-  @#C12
-  static const field self::Foo baz = #C6;
-  static const field self::Foo cafebabe = #C9;
+  static const field core::List<self::Foo> values = const <self::Foo>[self::Foo::bar, self::Foo::baz, self::Foo::cafebabe];
+  @self::hest
+  static const field self::Foo bar = const self::Foo::•(0, "Foo.bar");
+  @self::Fisk::fisk<dynamic>(self::hest)
+  static const field self::Foo baz = const self::Foo::•(1, "Foo.baz");
+  static const field self::Foo cafebabe = const self::Foo::•(2, "Foo.cafebabe");
   const constructor •(core::int index, core::String _name) → self::Foo
     : self::Foo::index = index, self::Foo::_name = _name, super core::Object::•()
     ;
   method toString() → core::String
     return this.{=self::Foo::_name};
 }
-static const field core::int hest = #C11;
+static const field core::int hest = 42;
 static method main() → dynamic {}
-
-constants  {
-  #C1 = 0
-  #C2 = "Foo.bar"
-  #C3 = self::Foo {index:#C1, _name:#C2}
-  #C4 = 1
-  #C5 = "Foo.baz"
-  #C6 = self::Foo {index:#C4, _name:#C5}
-  #C7 = 2
-  #C8 = "Foo.cafebabe"
-  #C9 = self::Foo {index:#C7, _name:#C8}
-  #C10 = <self::Foo>[#C3, #C6, #C9]
-  #C11 = 42
-  #C12 = self::Fisk<dynamic> {x:#C11}
-}

pkg/front_end/testcases/general/annotation_on_enum_values.dart.legacy.transformed.expect

@@ -11,32 +11,17 @@ class Fisk<T extends core::Object = dynamic> extends core::Object {
 class Foo extends core::Object {
   final field core::int index;
   final field core::String _name;
-  static const field core::List<self::Foo> values = #C10;
-  @#C11
-  static const field self::Foo bar = #C3;
-  @#C12
-  static const field self::Foo baz = #C6;
-  static const field self::Foo cafebabe = #C9;
+  static const field core::List<self::Foo> values = const <self::Foo>[self::Foo::bar, self::Foo::baz, self::Foo::cafebabe];
+  @self::hest
+  static const field self::Foo bar = const self::Foo::•(0, "Foo.bar");
+  @self::Fisk::fisk<dynamic>(self::hest)
+  static const field self::Foo baz = const self::Foo::•(1, "Foo.baz");
+  static const field self::Foo cafebabe = const self::Foo::•(2, "Foo.cafebabe");
   const constructor •(core::int index, core::String _name) → self::Foo
     : self::Foo::index = index, self::Foo::_name = _name, super core::Object::•()
     ;
   method toString() → core::String
     return this.{=self::Foo::_name};
 }
-static const field core::int hest = #C11;
+static const field core::int hest = 42;
 static method main() → dynamic {}
-
-constants  {
-  #C1 = 0
-  #C2 = "Foo.bar"
-  #C3 = self::Foo {index:#C1, _name:#C2}
-  #C4 = 1
-  #C5 = "Foo.baz"
-  #C6 = self::Foo {index:#C4, _name:#C5}
-  #C7 = 2
-  #C8 = "Foo.cafebabe"
-  #C9 = self::Foo {index:#C7, _name:#C8}
-  #C10 = <self::Foo>[#C3, #C6, #C9]
-  #C11 = 42
-  #C12 = self::Fisk<dynamic> {x:#C11}
-}

pkg/front_end/testcases/general/annotation_on_enum_values.dart.strong.expect

@@ -11,32 +11,17 @@ class Fisk<T extends core::Object = dynamic> extends core::Object {
 class Foo extends core::Object {
   final field core::int index;
   final field core::String _name;
-  static const field core::List<self::Foo> values = #C10;
-  @#C11
-  static const field self::Foo bar = #C3;
-  @#C12
-  static const field self::Foo baz = #C6;
-  static const field self::Foo cafebabe = #C9;
+  static const field core::List<self::Foo> values = const <self::Foo>[self::Foo::bar, self::Foo::baz, self::Foo::cafebabe];
+  @self::hest
+  static const field self::Foo bar = const self::Foo::•(0, "Foo.bar");
+  @self::Fisk::fisk<core::int>(self::hest)
+  static const field self::Foo baz = const self::Foo::•(1, "Foo.baz");
+  static const field self::Foo cafebabe = const self::Foo::•(2, "Foo.cafebabe");
   const constructor •(core::int index, core::String _name) → self::Foo
     : self::Foo::index = index, self::Foo::_name = _name, super core::Object::•()
     ;
   method toString() → core::String
     return this.{=self::Foo::_name};
 }
-static const field core::int hest = #C11;
+static const field core::int hest = 42;
 static method main() → dynamic {}
-
-constants  {
-  #C1 = 0
-  #C2 = "Foo.bar"
-  #C3 = self::Foo {index:#C1, _name:#C2}
-  #C4 = 1
-  #C5 = "Foo.baz"
-  #C6 = self::Foo {index:#C4, _name:#C5}
-  #C7 = 2
-  #C8 = "Foo.cafebabe"
-  #C9 = self::Foo {index:#C7, _name:#C8}
-  #C10 = <self::Foo>[#C3, #C6, #C9]
-  #C11 = 42
-  #C12 = self::Fisk<core::int> {x:#C11}
-}

pkg/front_end/testcases/general/annotation_on_enum_values.dart.strong.transformed.expect

@@ -11,32 +11,17 @@ class Fisk<T extends core::Object = dynamic> extends core::Object {
 class Foo extends core::Object {
   final field core::int index;
   final field core::String _name;
-  static const field core::List<self::Foo> values = #C10;
-  @#C11
-  static const field self::Foo bar = #C3;
-  @#C12
-  static const field self::Foo baz = #C6;
-  static const field self::Foo cafebabe = #C9;
+  static const field core::List<self::Foo> values = const <self::Foo>[self::Foo::bar, self::Foo::baz, self::Foo::cafebabe];
+  @self::hest
+  static const field self::Foo bar = const self::Foo::•(0, "Foo.bar");
+  @self::Fisk::fisk<core::int>(self::hest)
+  static const field self::Foo baz = const self::Foo::•(1, "Foo.baz");
+  static const field self::Foo cafebabe = const self::Foo::•(2, "Foo.cafebabe");
   const constructor •(core::int index, core::String _name) → self::Foo
     : self::Foo::index = index, self::Foo::_name = _name, super core::Object::•()
     ;
   method toString() → core::String
     return this.{=self::Foo::_name};
 }
-static const field core::int hest = #C11;
+static const field core::int hest = 42;
 static method main() → dynamic {}
-
-constants  {
-  #C1 = 0
-  #C2 = "Foo.bar"
-  #C3 = self::Foo {index:#C1, _name:#C2}
-  #C4 = 1
-  #C5 = "Foo.baz"
-  #C6 = self::Foo {index:#C4, _name:#C5}
-  #C7 = 2
-  #C8 = "Foo.cafebabe"
-  #C9 = self::Foo {index:#C7, _name:#C8}
-  #C10 = <self::Foo>[#C3, #C6, #C9]
-  #C11 = 42
-  #C12 = self::Fisk<core::int> {x:#C11}
-}

pkg/front_end/testcases/general/annotation_top.dart.legacy.expect

@@ -1,39 +1,34 @@
-@#C1
-@#C2
+@test::a
+@test::A::•(1)
 library test;
 import self as self;
 import "dart:core" as core;
 
-@#C1
-@#C2
+@self::a
+@self::A::•(2)
 typedef F1 = () → void;
-@#C1
-@#C2
+@self::a
+@self::A::•(3)
 typedef F2 = () → void;
 class A extends core::Object {
   const constructor •(core::int value) → self::A
     : super core::Object::•()
     ;
 }
-@#C1
-@#C2
+@self::a
+@self::A::•(2)
 class C extends core::Object {
   synthetic constructor •() → self::C
     : super core::Object::•()
     ;
 }
-static const field core::Object a = #C1;
-@#C1
-@#C2
+static const field core::Object a = const core::Object::•();
+@self::a
+@self::A::•(3)
 static field core::int f1;
-@#C1
-@#C2
+@self::a
+@self::A::•(3)
 static field core::int f2;
-@#C1
-@#C2
+@self::a
+@self::A::•(4)
 static method main() → void {}
-
-constants  {
-  #C1 = core::Object {}
-  #C2 = self::A {}
-}

pkg/front_end/testcases/general/annotation_top.dart.legacy.transformed.expect

@@ -1,39 +1,34 @@
-@#C1
-@#C2
+@test::a
+@test::A::•(1)
 library test;
 import self as self;
 import "dart:core" as core;
 
-@#C1
-@#C2
+@self::a
+@self::A::•(2)
 typedef F1 = () → void;
-@#C1
-@#C2
+@self::a
+@self::A::•(3)
 typedef F2 = () → void;
 class A extends core::Object {
   const constructor •(core::int value) → self::A
     : super core::Object::•()
     ;
 }
-@#C1
-@#C2
+@self::a
+@self::A::•(2)
 class C extends core::Object {
   synthetic constructor •() → self::C
     : super core::Object::•()
     ;
 }
-static const field core::Object a = #C1;
-@#C1
-@#C2
+static const field core::Object a = const core::Object::•();
+@self::a
+@self::A::•(3)
 static field core::int f1;
-@#C1
-@#C2
+@self::a
+@self::A::•(3)
 static field core::int f2;
-@#C1
-@#C2
+@self::a
+@self::A::•(4)
 static method main() → void {}
-
-constants  {
-  #C1 = core::Object {}
-  #C2 = self::A {}
-}

pkg/front_end/testcases/general/annotation_top.dart.strong.expect

@@ -1,39 +1,34 @@
-@#C1
-@#C2
+@test::a
+@test::A::•(1)
 library test;
 import self as self;
 import "dart:core" as core;
 
-@#C1
-@#C2
+@self::a
+@self::A::•(2)
 typedef F1 = () → void;
-@#C1
-@#C2
+@self::a
+@self::A::•(3)
 typedef F2 = () → void;
 class A extends core::Object {
   const constructor •(core::int value) → self::A
     : super core::Object::•()
     ;
 }
-@#C1
-@#C2
+@self::a
+@self::A::•(2)
 class C extends core::Object {
   synthetic constructor •() → self::C
     : super core::Object::•()
     ;
 }
-static const field core::Object a = #C1;
-@#C1
-@#C2
+static const field core::Object a = const core::Object::•();
+@self::a
+@self::A::•(3)
 static field core::int f1;
-@#C1
-@#C2
+@self::a
+@self::A::•(3)
 static field core::int f2;
-@#C1
-@#C2
+@self::a
+@self::A::•(4)
 static method main() → void {}
-
-constants  {
-  #C1 = core::Object {}
-  #C2 = self::A {}
-}

pkg/front_end/testcases/general/annotation_top.dart.strong.transformed.expect

@@ -1,39 +1,34 @@
-@#C1
-@#C2
+@test::a
+@test::A::•(1)
 library test;
 import self as self;
 import "dart:core" as core;
 
-@#C1
-@#C2
+@self::a
+@self::A::•(2)
 typedef F1 = () → void;
-@#C1
-@#C2
+@self::a
+@self::A::•(3)
 typedef F2 = () → void;
 class A extends core::Object {
   const constructor •(core::int value) → self::A
     : super core::Object::•()
     ;
 }
-@#C1
-@#C2
+@self::a
+@self::A::•(2)
 class C extends core::Object {
   synthetic constructor •() → self::C
     : super core::Object::•()
     ;
 }
-static const field core::Object a = #C1;
-@#C1
-@#C2
+static const field core::Object a = const core::Object::•();
+@self::a
+@self::A::•(3)
 static field core::int f1;
-@#C1
-@#C2
+@self::a
+@self::A::•(3)
 static field core::int f2;
-@#C1
-@#C2
+@self::a
+@self::A::•(4)
 static method main() → void {}
-
-constants  {
-  #C1 = core::Object {}
-  #C2 = self::A {}
-}

pkg/front_end/testcases/general/annotation_typedef_formals.dart.legacy.expect

@@ -2,15 +2,9 @@ library;
 import self as self;
 import "dart:core" as core;
 
-typedef F = (@#C1 core::int x, core::num y, {@#C2 @#C3 core::String z, core::Object w}) → void;
-typedef G = (@#C1 core::int a, core::num b, [@#C2 @#C3 core::String c, core::Object d]) → void;
-static const field core::int foo = #C1;
-static const field core::int bar = #C2;
-static const field core::int baz = #C3;
+typedef F = (@self::foo core::int x, core::num y, {@self::bar @self::baz core::String z, core::Object w}) → void;
+typedef G = (@self::foo core::int a, core::num b, [@self::bar @self::baz core::String c, core::Object d]) → void;
+static const field core::int foo = 21;
+static const field core::int bar = 42;
+static const field core::int baz = 84;
 static method main() → dynamic {}
-
-constants  {
-  #C1 = 21
-  #C2 = 42
-  #C3 = 84
-}

pkg/front_end/testcases/general/annotation_typedef_formals.dart.legacy.transformed.expect

@@ -2,15 +2,9 @@ library;
 import self as self;
 import "dart:core" as core;
 
-typedef F = (@#C1 core::int x, core::num y, {@#C2 @#C3 core::String z, core::Object w}) → void;
-typedef G = (@#C1 core::int a, core::num b, [@#C2 @#C3 core::String c, core::Object d]) → void;
-static const field core::int foo = #C1;
-static const field core::int bar = #C2;
-static const field core::int baz = #C3;
+typedef F = (@self::foo core::int x, core::num y, {@self::bar @self::baz core::String z, core::Object w}) → void;
+typedef G = (@self::foo core::int a, core::num b, [@self::bar @self::baz core::String c, core::Object d]) → void;
+static const field core::int foo = 21;
+static const field core::int bar = 42;
+static const field core::int baz = 84;
 static method main() → dynamic {}
-
-constants  {
-  #C1 = 21
-  #C2 = 42
-  #C3 = 84
-}

pkg/front_end/testcases/general/annotation_typedef_formals.dart.strong.expect

@@ -2,15 +2,9 @@ library;
 import self as self;
 import "dart:core" as core;
 
-typedef F = (@#C1 core::int x, core::num y, {@#C2 @#C3 core::String z, core::Object w}) → void;
-typedef G = (@#C1 core::int a, core::num b, [@#C2 @#C3 core::String c, core::Object d]) → void;
-static const field core::int foo = #C1;
-static const field core::int bar = #C2;
-static const field core::int baz = #C3;
+typedef F = (@self::foo core::int x, core::num y, {@self::bar @self::baz core::String z, core::Object w}) → void;
+typedef G = (@self::foo core::int a, core::num b, [@self::bar @self::baz core::String c, core::Object d]) → void;
+static const field core::int foo = 21;
+static const field core::int bar = 42;
+static const field core::int baz = 84;
 static method main() → dynamic {}
-
-constants  {
-  #C1 = 21
-  #C2 = 42
-  #C3 = 84
-}

pkg/front_end/testcases/general/annotation_typedef_formals.dart.strong.transformed.expect

@@ -2,15 +2,9 @@ library;
 import self as self;
 import "dart:core" as core;
 
-typedef F = (@#C1 core::int x, core::num y, {@#C2 @#C3 core::String z, core::Object w}) → void;
-typedef G = (@#C1 core::int a, core::num b, [@#C2 @#C3 core::String c, core::Object d]) → void;
-static const field core::int foo = #C1;
-static const field core::int bar = #C2;
-static const field core::int baz = #C3;
+typedef F = (@self::foo core::int x, core::num y, {@self::bar @self::baz core::String z, core::Object w}) → void;
+typedef G = (@self::foo core::int a, core::num b, [@self::bar @self::baz core::String c, core::Object d]) → void;
+static const field core::int foo = 21;
+static const field core::int bar = 42;
+static const field core::int baz = 84;
 static method main() → dynamic {}
-
-constants  {
-  #C1 = 21
-  #C2 = 42
-  #C3 = 84
-}

pkg/front_end/testcases/general/annotation_typedef_formals_resolution.dart.legacy.expect

@@ -2,10 +2,6 @@ library;
 import self as self;
 import "dart:core" as core;
 
-typedef F = (@#C1 core::int app) → core::int;
-static const field core::int app = #C1;
+typedef F = (@self::app core::int app) → core::int;
+static const field core::int app = 0;
 static method main() → dynamic {}
-
-constants  {
-  #C1 = 0
-}

pkg/front_end/testcases/general/annotation_typedef_formals_resolution.dart.legacy.transformed.expect

@@ -2,10 +2,6 @@ library;
 import self as self;
 import "dart:core" as core;
 
-typedef F = (@#C1 core::int app) → core::int;
-static const field core::int app = #C1;
+typedef F = (@self::app core::int app) → core::int;
+static const field core::int app = 0;
 static method main() → dynamic {}
-
-constants  {
-  #C1 = 0
-}

pkg/front_end/testcases/general/annotation_typedef_formals_resolution.dart.strong.expect

@@ -2,10 +2,6 @@ library;
 import self as self;
 import "dart:core" as core;
 
-typedef F = (@#C1 core::int app) → core::int;
-static const field core::int app = #C1;
+typedef F = (@self::app core::int app) → core::int;
+static const field core::int app = 0;
 static method main() → dynamic {}
-
-constants  {
-  #C1 = 0
-}

pkg/front_end/testcases/general/annotation_typedef_formals_resolution.dart.strong.transformed.expect

@@ -2,10 +2,6 @@ library;
 import self as self;
 import "dart:core" as core;
 
-typedef F = (@#C1 core::int app) → core::int;
-static const field core::int app = #C1;
+typedef F = (@self::app core::int app) → core::int;
+static const field core::int app = 0;
 static method main() → dynamic {}
-
-constants  {
-  #C1 = 0
-}

pkg/front_end/testcases/general/annotation_variable_declaration.dart.legacy.expect

@@ -2,7 +2,7 @@ library;
 import self as self;
 import "dart:core" as core;
 
-typedef hest_t = ({@#C1 dynamic named}) → dynamic;
+typedef hest_t = ({@self::foo dynamic named}) → dynamic;
 class Bar extends core::Object {
   const constructor •() → self::Bar
     : super core::Object::•()
@@ -12,31 +12,25 @@ class Bar extends core::Object {
     ;
 }
 class Baz extends core::Object {
-  constructor •(@#C1 dynamic constructorFormal) → self::Baz
+  constructor •(@self::foo dynamic constructorFormal) → self::Baz
     : super core::Object::•()
     ;
-  static factory bazFactory(@#C1 dynamic factoryFormal) → self::Baz
+  static factory bazFactory(@self::foo dynamic factoryFormal) → self::Baz
     return null;
-  method fisk(@#C1 dynamic formal1, @#C2 dynamic formal2, @#C2 dynamic formal3, @#C1 @#C2 dynamic formal4, [@#C1 dynamic optional = #C3]) → dynamic {
-    @#C1 dynamic local1;
-    @#C2 dynamic local2;
-    @#C2 dynamic local3;
-    @#C1 @#C2 dynamic local4;
-    @#C1 dynamic localWithInitializer = "hello";
-    @#C1 @#C2 dynamic localGroupPart1;
-    @#C1 @#C2 dynamic localGroupPart2;
-    function naebdyr(@#C1 dynamic nestedFormal) → dynamic
+  method fisk(@self::foo dynamic formal1, @self::Bar::•() dynamic formal2, @self::Bar::named(self::foo) dynamic formal3, @self::foo @self::Bar::named(self::foo) dynamic formal4, [@self::foo dynamic optional = null]) → dynamic {
+    @self::foo dynamic local1;
+    @self::Bar::•() dynamic local2;
+    @self::Bar::named(self::foo) dynamic local3;
+    @self::foo @self::Bar::named(self::foo) dynamic local4;
+    @self::foo dynamic localWithInitializer = "hello";
+    @self::foo @self::Bar::named(self::foo) dynamic localGroupPart1;
+    @self::foo @self::Bar::named(self::foo) dynamic localGroupPart2;
+    function naebdyr(@self::foo dynamic nestedFormal) → dynamic
       return null;
-    dynamic roedmus = (@#C1 dynamic closureFormal) → dynamic => null;
+    dynamic roedmus = (@self::foo dynamic closureFormal) → dynamic => null;
   }
-  method hest({@#C1 dynamic named = #C3}) → dynamic
+  method hest({@self::foo dynamic named = null}) → dynamic
     return null;
 }
-static const field core::int foo = #C1;
+static const field core::int foo = 42;
 static method main() → dynamic {}
-
-constants  {
-  #C1 = 42
-  #C2 = self::Bar {}
-  #C3 = null
-}

pkg/front_end/testcases/general/annotation_variable_declaration.dart.legacy.transformed.expect

@@ -2,7 +2,7 @@ library;
 import self as self;
 import "dart:core" as core;
 
-typedef hest_t = ({@#C1 dynamic named}) → dynamic;
+typedef hest_t = ({@self::foo dynamic named}) → dynamic;
 class Bar extends core::Object {
   const constructor •() → self::Bar
     : super core::Object::•()
@@ -12,31 +12,25 @@ class Bar extends core::Object {
     ;
 }
 class Baz extends core::Object {
-  constructor •(@#C1 dynamic constructorFormal) → self::Baz
+  constructor •(@self::foo dynamic constructorFormal) → self::Baz
     : super core::Object::•()
     ;
-  static factory bazFactory(@#C1 dynamic factoryFormal) → self::Baz
+  static factory bazFactory(@self::foo dynamic factoryFormal) → self::Baz
     return null;
-  method fisk(@#C1 dynamic formal1, @#C2 dynamic formal2, @#C2 dynamic formal3, @#C1 @#C2 dynamic formal4, [@#C1 dynamic optional = #C3]) → dynamic {
-    @#C1 dynamic local1;
-    @#C2 dynamic local2;
-    @#C2 dynamic local3;
-    @#C1 @#C2 dynamic local4;
-    @#C1 dynamic localWithInitializer = "hello";
-    @#C1 @#C2 dynamic localGroupPart1;
-    @#C1 @#C2 dynamic localGroupPart2;
-    function naebdyr(@#C1 dynamic nestedFormal) → dynamic
+  method fisk(@self::foo dynamic formal1, @self::Bar::•() dynamic formal2, @self::Bar::named(self::foo) dynamic formal3, @self::foo @self::Bar::named(self::foo) dynamic formal4, [@self::foo dynamic optional = null]) → dynamic {
+    @self::foo dynamic local1;
+    @self::Bar::•() dynamic local2;
+    @self::Bar::named(self::foo) dynamic local3;
+    @self::foo @self::Bar::named(self::foo) dynamic local4;
+    @self::foo dynamic localWithInitializer = "hello";
+    @self::foo @self::Bar::named(self::foo) dynamic localGroupPart1;
+    @self::foo @self::Bar::named(self::foo) dynamic localGroupPart2;
+    function naebdyr(@self::foo dynamic nestedFormal) → dynamic
       return null;
-    dynamic roedmus = (@#C1 dynamic closureFormal) → dynamic => null;
+    dynamic roedmus = (@self::foo dynamic closureFormal) → dynamic => null;
   }
-  method hest({@#C1 dynamic named = #C3}) → dynamic
+  method hest({@self::foo dynamic named = null}) → dynamic
     return null;
 }
-static const field core::int foo = #C1;
+static const field core::int foo = 42;
 static method main() → dynamic {}
-
-constants  {
-  #C1 = 42
-  #C2 = self::Bar {}
-  #C3 = null
-}

pkg/front_end/testcases/general/annotation_variable_declaration.dart.strong.expect

@@ -2,7 +2,7 @@ library;
 import self as self;
 import "dart:core" as core;
 
-typedef hest_t = ({@#C1 dynamic named}) → dynamic;
+typedef hest_t = ({@self::foo dynamic named}) → dynamic;
 class Bar extends core::Object {
   const constructor •() → self::Bar
     : super core::Object::•()
@@ -12,31 +12,25 @@ class Bar extends core::Object {
     ;
 }
 class Baz extends core::Object {
-  constructor •(@#C1 dynamic constructorFormal) → self::Baz
+  constructor •(@self::foo dynamic constructorFormal) → self::Baz
     : super core::Object::•()
     ;
-  static factory bazFactory(@#C1 dynamic factoryFormal) → self::Baz
+  static factory bazFactory(@self::foo dynamic factoryFormal) → self::Baz
     return null;
-  method fisk(@#C1 dynamic formal1, @#C2 dynamic formal2, @#C2 dynamic formal3, @#C1 @#C2 dynamic formal4, [@#C1 dynamic optional = #C3]) → dynamic {
-    @#C1 dynamic local1;
-    @#C2 dynamic local2;
-    @#C2 dynamic local3;
-    @#C1 @#C2 dynamic local4;
-    @#C1 core::String localWithInitializer = "hello";
-    @#C1 @#C2 dynamic localGroupPart1;
-    @#C1 @#C2 dynamic localGroupPart2;
-    function naebdyr(@#C1 dynamic nestedFormal) → core::Null
+  method fisk(@self::foo dynamic formal1, @self::Bar::•() dynamic formal2, @self::Bar::named(self::foo) dynamic formal3, @self::foo @self::Bar::named(self::foo) dynamic formal4, [@self::foo dynamic optional = null]) → dynamic {
+    @self::foo dynamic local1;
+    @self::Bar::•() dynamic local2;
+    @self::Bar::named(self::foo) dynamic local3;
+    @self::foo @self::Bar::named(self::foo) dynamic local4;
+    @self::foo core::String localWithInitializer = "hello";
+    @self::foo @self::Bar::named(self::foo) dynamic localGroupPart1;
+    @self::foo @self::Bar::named(self::foo) dynamic localGroupPart2;
+    function naebdyr(@self::foo dynamic nestedFormal) → core::Null
       return null;
-    (dynamic) → core::Null roedmus = (@#C1 dynamic closureFormal) → core::Null => null;
+    (dynamic) → core::Null roedmus = (@self::foo dynamic closureFormal) → core::Null => null;
   }
-  method hest({@#C1 dynamic named = #C3}) → dynamic
+  method hest({@self::foo dynamic named = null}) → dynamic
     return null;
 }
-static const field core::int foo = #C1;
+static const field core::int foo = 42;
 static method main() → dynamic {}
-
-constants  {
-  #C1 = 42
-  #C2 = self::Bar {}
-  #C3 = null
-}

pkg/front_end/testcases/general/annotation_variable_declaration.dart.strong.transformed.expect

@@ -2,7 +2,7 @@ library;
 import self as self;
 import "dart:core" as core;
 
-typedef hest_t = ({@#C1 dynamic named}) → dynamic;
+typedef hest_t = ({@self::foo dynamic named}) → dynamic;
 class Bar extends core::Object {
   const constructor •() → self::Bar
     : super core::Object::•()
@@ -12,31 +12,25 @@ class Bar extends core::Object {
     ;
 }
 class Baz extends core::Object {
-  constructor •(@#C1 dynamic constructorFormal) → self::Baz
+  constructor •(@self::foo dynamic constructorFormal) → self::Baz
     : super core::Object::•()
     ;
-  static factory bazFactory(@#C1 dynamic factoryFormal) → self::Baz
+  static factory bazFactory(@self::foo dynamic factoryFormal) → self::Baz
     return null;
-  method fisk(@#C1 dynamic formal1, @#C2 dynamic formal2, @#C2 dynamic formal3, @#C1 @#C2 dynamic formal4, [@#C1 dynamic optional = #C3]) → dynamic {
-    @#C1 dynamic local1;
-    @#C2 dynamic local2;
-    @#C2 dynamic local3;
-    @#C1 @#C2 dynamic local4;
-    @#C1 core::String localWithInitializer = "hello";
-    @#C1 @#C2 dynamic localGroupPart1;
-    @#C1 @#C2 dynamic localGroupPart2;
-    function naebdyr(@#C1 dynamic nestedFormal) → core::Null
+  method fisk(@self::foo dynamic formal1, @self::Bar::•() dynamic formal2, @self::Bar::named(self::foo) dynamic formal3, @self::foo @self::Bar::named(self::foo) dynamic formal4, [@self::foo dynamic optional = null]) → dynamic {
+    @self::foo dynamic local1;
+    @self::Bar::•() dynamic local2;
+    @self::Bar::named(self::foo) dynamic local3;
+    @self::foo @self::Bar::named(self::foo) dynamic local4;
+    @self::foo core::String localWithInitializer = "hello";
+    @self::foo @self::Bar::named(self::foo) dynamic localGroupPart1;
+    @self::foo @self::Bar::named(self::foo) dynamic localGroupPart2;
+    function naebdyr(@self::foo dynamic nestedFormal) → core::Null
       return null;
-    (dynamic) → core::Null roedmus = (@#C1 dynamic closureFormal) → core::Null => null;
+    (dynamic) → core::Null roedmus = (@self::foo dynamic closureFormal) → core::Null => null;
   }
-  method hest({@#C1 dynamic named = #C3}) → dynamic
+  method hest({@self::foo dynamic named = null}) → dynamic
     return null;
 }
-static const field core::int foo = #C1;
+static const field core::int foo = 42;
 static method main() → dynamic {}
-
-constants  {
-  #C1 = 42
-  #C2 = self::Bar {}
-  #C3 = null
-}

pkg/front_end/testcases/general/argument.dart.legacy.expect

@@ -32,11 +32,6 @@ static method escape(dynamic fn) → void {
 static method main() → dynamic {
   self::foo(new self::Foo::•());
   self::bar(new self::Bar::•());
-  self::escape(#C1);
-  self::escape(#C2);
-}
-
-constants  {
-  #C1 = tearoff self::foo_escaped
-  #C2 = tearoff self::bar_escaped
+  self::escape(self::foo_escaped);
+  self::escape(self::bar_escaped);
 }

pkg/front_end/testcases/general/argument.dart.legacy.transformed.expect

@@ -32,11 +32,6 @@ static method escape(dynamic fn) → void {
 static method main() → dynamic {
   self::foo(new self::Foo::•());
   self::bar(new self::Bar::•());
-  self::escape(#C1);
-  self::escape(#C2);
-}
-
-constants  {
-  #C1 = tearoff self::foo_escaped
-  #C2 = tearoff self::bar_escaped
+  self::escape(self::foo_escaped);
+  self::escape(self::bar_escaped);
 }

pkg/front_end/testcases/general/argument.dart.strong.expect

@@ -32,11 +32,6 @@ static method escape(dynamic fn) → void {
 static method main() → dynamic {
   self::foo(new self::Foo::•());
   self::bar(new self::Bar::•());
-  self::escape(#C1);
-  self::escape(#C2);
-}
-
-constants  {
-  #C1 = tearoff self::foo_escaped
-  #C2 = tearoff self::bar_escaped
+  self::escape(self::foo_escaped);
+  self::escape(self::bar_escaped);
 }

pkg/front_end/testcases/general/argument.dart.strong.transformed.expect

@@ -32,11 +32,6 @@ static method escape(dynamic fn) → void {
 static method main() → dynamic {
   self::foo(new self::Foo::•());
   self::bar(new self::Bar::•());
-  self::escape(#C1);
-  self::escape(#C2);
-}
-
-constants  {
-  #C1 = tearoff self::foo_escaped
-  #C2 = tearoff self::bar_escaped
+  self::escape(self::foo_escaped);
+  self::escape(self::bar_escaped);
 }

pkg/front_end/testcases/general/argument_mismatch.dart.legacy.expect

@@ -15,13 +15,6 @@ import "dart:core" as core;
 
 static method foo() → dynamic {}
 static method test() → dynamic {
-  throw new core::NoSuchMethodError::withInvocation(null, new core::_InvocationMirror::_withType(#C1, 32, #C2, core::List::unmodifiable<dynamic>(<dynamic>[null]), core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+  throw new core::NoSuchMethodError::withInvocation(null, new core::_InvocationMirror::_withType(#foo, 32, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>[null]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
 }
 static method main() → dynamic {}
-
-constants  {
-  #C1 = #foo
-  #C2 = <core::Type>[]
-  #C3 = <dynamic>[]
-  #C4 = core::_ImmutableMap<core::Symbol, dynamic> {_kvPairs:#C3}
-}

pkg/front_end/testcases/general/argument_mismatch.dart.legacy.transformed.expect

@@ -15,13 +15,6 @@ import "dart:core" as core;
 
 static method foo() → dynamic {}
 static method test() → dynamic {
-  throw new core::NoSuchMethodError::withInvocation(null, new core::_InvocationMirror::_withType(#C1, 32, #C2, core::List::unmodifiable<dynamic>(<dynamic>[null]), core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+  throw new core::NoSuchMethodError::withInvocation(null, new core::_InvocationMirror::_withType(#foo, 32, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>[null]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
 }
 static method main() → dynamic {}
-
-constants  {
-  #C1 = #foo
-  #C2 = <core::Type>[]
-  #C3 = <dynamic>[]
-  #C4 = core::_ImmutableMap<core::Symbol, dynamic> {_kvPairs:#C3}
-}

pkg/front_end/testcases/general/async_nested.dart.legacy.expect

@@ -8,7 +8,7 @@ import "dart:async";
 class Node extends core::Object {
   final field core::List<self::Node> nested;
   final field core::String name;
-  constructor •(core::String name, [core::List<self::Node> nested = #C1]) → self::Node
+  constructor •(core::String name, [core::List<self::Node> nested = null]) → self::Node
     : self::Node::name = name, self::Node::nested = nested, super core::Object::•() {}
   method toString() → core::String
     return "<${this.{self::Node::name}}:[${let final dynamic #t1 = this.{self::Node::nested} in #t1.==(null) ? null : #t1.join(", ")}]>";
@@ -26,7 +26,3 @@ static method main() → void async {
     throw "Expected '${expected}' but got '${actual}'";
   }
 }
-
-constants  {
-  #C1 = null
-}

pkg/front_end/testcases/general/async_nested.dart.legacy.transformed.expect

@@ -8,7 +8,7 @@ import "dart:async";
 class Node extends core::Object {
   final field core::List<self::Node> nested;
   final field core::String name;
-  constructor •(core::String name, [core::List<self::Node> nested = #C1]) → self::Node
+  constructor •(core::String name, [core::List<self::Node> nested = null]) → self::Node
     : self::Node::name = name, self::Node::nested = nested, super core::Object::•() {}
   method toString() → core::String
     return "<${this.{self::Node::name}}:[${let final dynamic #t1 = this.{self::Node::nested} in #t1.==(null) ? null : #t1.join(", ")}]>";
@@ -64,7 +64,3 @@ static method main() → void /* originally async */ {
   :async_completer.start(:async_op);
   return :async_completer.{asy::Completer::future};
 }
-
-constants  {
-  #C1 = null
-}

pkg/front_end/testcases/general/async_nested.dart.strong.expect

@@ -8,7 +8,7 @@ import "dart:async";
 class Node extends core::Object {
   final field core::List<self::Node> nested;
   final field core::String name;
-  constructor •(core::String name, [core::List<self::Node> nested = #C1]) → self::Node
+  constructor •(core::String name, [core::List<self::Node> nested = null]) → self::Node
     : self::Node::name = name, self::Node::nested = nested, super core::Object::•() {}
   method toString() → core::String
     return "<${this.{self::Node::name}}:[${let final core::List<self::Node> #t1 = this.{self::Node::nested} in #t1.==(null) ?{core::String} null : #t1.{core::Iterable::join}(", ")}]>";
@@ -26,7 +26,3 @@ static method main() → void async {
     throw "Expected '${expected}' but got '${actual}'";
   }
 }
-
-constants  {
-  #C1 = null
-}

pkg/front_end/testcases/general/async_nested.dart.strong.transformed.expect

@@ -8,7 +8,7 @@ import "dart:async";
 class Node extends core::Object {
   final field core::List<self::Node> nested;
   final field core::String name;
-  constructor •(core::String name, [core::List<self::Node> nested = #C1]) → self::Node
+  constructor •(core::String name, [core::List<self::Node> nested = null]) → self::Node
     : self::Node::name = name, self::Node::nested = nested, super core::Object::•() {}
   method toString() → core::String
     return "<${this.{self::Node::name}}:[${let final core::List<self::Node> #t1 = this.{self::Node::nested} in #t1.==(null) ?{core::String} null : #t1.{core::Iterable::join}(", ")}]>";
@@ -64,7 +64,3 @@ static method main() → void /* originally async */ {
   :async_completer.start(:async_op);
   return :async_completer.{asy::Completer::future};
 }
-
-constants  {
-  #C1 = null
-}

pkg/front_end/testcases/general/bug32426.dart.legacy.expect

@@ -12,13 +12,9 @@ class C extends core::Object implements self::I {
   synthetic constructor •() → self::C
     : super core::Object::•()
     ;
-  method call([core::int x = #C1]) → void {}
+  method call([core::int x = null]) → void {}
 }
 static method main() → dynamic {
   self::I i = new self::C::•();
   ([core::int]) → void f = i;
 }
-
-constants  {
-  #C1 = null
-}

pkg/front_end/testcases/general/bug32426.dart.legacy.transformed.expect

@@ -12,13 +12,9 @@ class C extends core::Object implements self::I {
   synthetic constructor •() → self::C
     : super core::Object::•()
     ;
-  method call([core::int x = #C1]) → void {}
+  method call([core::int x = null]) → void {}
 }
 static method main() → dynamic {
   self::I i = new self::C::•();
   ([core::int]) → void f = i;
 }
-
-constants  {
-  #C1 = null
-}

pkg/front_end/testcases/general/bug32426.dart.strong.expect

@@ -12,13 +12,9 @@ class C extends core::Object implements self::I {
   synthetic constructor •() → self::C
     : super core::Object::•()
     ;
-  method call([core::int x = #C1]) → void {}
+  method call([core::int x = null]) → void {}
 }
 static method main() → dynamic {
   self::I i = new self::C::•();
   ([core::int]) → void f = (let final self::I #t1 = i in #t1.==(null) ?{() → void} null : #t1.{self::I::call}) as{TypeError} ([core::int]) → void;
 }
-
-constants  {
-  #C1 = null
-}

pkg/front_end/testcases/general/bug32426.dart.strong.transformed.expect

@@ -12,13 +12,9 @@ class C extends core::Object implements self::I {
   synthetic constructor •() → self::C
     : super core::Object::•()
     ;
-  method call([core::int x = #C1]) → void {}
+  method call([core::int x = null]) → void {}
 }
 static method main() → dynamic {
   self::I i = new self::C::•();
   ([core::int]) → void f = (let final self::I #t1 = i in #t1.==(null) ?{() → void} null : #t1.{self::I::call}) as{TypeError} ([core::int]) → void;
 }
-
-constants  {
-  #C1 = null
-}

pkg/front_end/testcases/general/bug33099.dart.strong.expect

@@ -14,7 +14,7 @@ class MyTest extends core::Object {
   synthetic constructor •() → self::MyTest
     : super core::Object::•()
     ;
-  @#C1
+  @self::failingTest
   method foo() → void {}
 }
 abstract class _MyTest2&Object&MyTest = core::Object with self::MyTest {
@@ -27,18 +27,18 @@ class MyTest2 extends self::_MyTest2&Object&MyTest {
     : super self::_MyTest2&Object&MyTest::•()
     ;
 }
-static const field self::_FailingTest failingTest = #C1;
+static const field self::_FailingTest failingTest = const self::_FailingTest::•();
 static method main() → dynamic {
   mir::ClassMirror classMirror = mir::reflectClass(self::MyTest2);
   classMirror.{mir::ClassMirror::instanceMembers}.{core::Map::forEach}((core::Symbol symbol, mir::MethodMirror memberMirror) → core::Null {
-    if(memberMirror.{mir::DeclarationMirror::simpleName}.{core::Symbol::==}(#C2)) {
+    if(memberMirror.{mir::DeclarationMirror::simpleName}.{core::Symbol::==}(#foo)) {
       core::print(memberMirror);
       core::print(self::_hasFailingTestAnnotation(memberMirror));
     }
   });
 }
 static method _hasFailingTestAnnotation(mir::MethodMirror method) → core::bool {
-  core::bool r = self::_hasAnnotationInstance(method, #C1);
+  core::bool r = self::_hasAnnotationInstance(method, self::failingTest);
   core::print("[_hasFailingTestAnnotation] ${method} ${r}");
   return r;
 }
@@ -47,8 +47,3 @@ static method _hasAnnotationInstance(mir::DeclarationMirror declaration, dynamic
     core::print("annotation: ${annotation.{mir::InstanceMirror::reflectee}}");
     return core::identical(annotation.{mir::InstanceMirror::reflectee}, instance);
   });
-
-constants  {
-  #C1 = self::_FailingTest {}
-  #C2 = #foo
-}

pkg/front_end/testcases/general/bug33099.dart.strong.transformed.expect

@@ -14,14 +14,14 @@ class MyTest extends core::Object {
   synthetic constructor •() → self::MyTest
     : super core::Object::•()
     ;
-  @#C1
+  @self::failingTest
   method foo() → void {}
 }
 abstract class _MyTest2&Object&MyTest extends core::Object implements self::MyTest {
   const synthetic constructor •() → self::_MyTest2&Object&MyTest
     : super core::Object::•()
     ;
-  @#C1
+  @self::failingTest
   method foo() → void {}
 }
 class MyTest2 extends self::_MyTest2&Object&MyTest {
@@ -29,18 +29,18 @@ class MyTest2 extends self::_MyTest2&Object&MyTest {
     : super self::_MyTest2&Object&MyTest::•()
     ;
 }
-static const field self::_FailingTest failingTest = #C1;
+static const field self::_FailingTest failingTest = const self::_FailingTest::•();
 static method main() → dynamic {
   mir::ClassMirror classMirror = mir::reflectClass(self::MyTest2);
   classMirror.{mir::ClassMirror::instanceMembers}.{core::Map::forEach}((core::Symbol symbol, mir::MethodMirror memberMirror) → core::Null {
-    if(memberMirror.{mir::DeclarationMirror::simpleName}.{core::Symbol::==}(#C2)) {
+    if(memberMirror.{mir::DeclarationMirror::simpleName}.{core::Symbol::==}(#foo)) {
       core::print(memberMirror);
       core::print(self::_hasFailingTestAnnotation(memberMirror));
     }
   });
 }
 static method _hasFailingTestAnnotation(mir::MethodMirror method) → core::bool {
-  core::bool r = self::_hasAnnotationInstance(method, #C1);
+  core::bool r = self::_hasAnnotationInstance(method, self::failingTest);
   core::print("[_hasFailingTestAnnotation] ${method} ${r}");
   return r;
 }
@@ -49,8 +49,3 @@ static method _hasAnnotationInstance(mir::DeclarationMirror declaration, dynamic
     core::print("annotation: ${annotation.{mir::InstanceMirror::reflectee}}");
     return core::identical(annotation.{mir::InstanceMirror::reflectee}, instance);
   });
-
-constants  {
-  #C1 = self::_FailingTest {}
-  #C2 = #foo
-}

pkg/front_end/testcases/general/constructor_const_inference.dart.legacy.expect

@@ -15,7 +15,7 @@ class A<T extends core::Object = dynamic> extends core::Object {
 }
 class B<T extends core::Object = dynamic> extends self::A<self::B::T> {
   constructor •() → self::B<self::B::T>
-    : super self::A::•(#C1)
+    : super self::A::•(const self::_Y::•<dynamic>())
     ;
 }
 static method main() → dynamic {
@@ -24,7 +24,3 @@ static method main() → dynamic {
     throw "Unexpected run-time type: `new B().x` is ${x.runtimeType}, but `_Y<Null>` expected";
   }
 }
-
-constants  {
-  #C1 = self::_Y<dynamic> {}
-}

pkg/front_end/testcases/general/constructor_const_inference.dart.legacy.transformed.expect

@@ -15,7 +15,7 @@ class A<T extends core::Object = dynamic> extends core::Object {
 }
 class B<T extends core::Object = dynamic> extends self::A<self::B::T> {
   constructor •() → self::B<self::B::T>
-    : super self::A::•(#C1)
+    : super self::A::•(const self::_Y::•<dynamic>())
     ;
 }
 static method main() → dynamic {
@@ -24,7 +24,3 @@ static method main() → dynamic {
     throw "Unexpected run-time type: `new B().x` is ${x.runtimeType}, but `_Y<Null>` expected";
   }
 }
-
-constants  {
-  #C1 = self::_Y<dynamic> {}
-}

pkg/front_end/testcases/general/constructor_const_inference.dart.strong.expect

@@ -15,7 +15,7 @@ class A<T extends core::Object = dynamic> extends core::Object {
 }
 class B<T extends core::Object = dynamic> extends self::A<self::B::T> {
   constructor •() → self::B<self::B::T>
-    : super self::A::•(#C1)
+    : super self::A::•(const self::_Y::•<core::Null>())
     ;
 }
 static method main() → dynamic {
@@ -24,7 +24,3 @@ static method main() → dynamic {
     throw "Unexpected run-time type: `new B().x` is ${x.{core::Object::runtimeType}}, but `_Y<Null>` expected";
   }
 }
-
-constants  {
-  #C1 = self::_Y<core::Null> {}
-}

pkg/front_end/testcases/general/constructor_const_inference.dart.strong.transformed.expect

@@ -15,7 +15,7 @@ class A<T extends core::Object = dynamic> extends core::Object {
 }
 class B<T extends core::Object = dynamic> extends self::A<self::B::T> {
   constructor •() → self::B<self::B::T>
-    : super self::A::•(#C1)
+    : super self::A::•(const self::_Y::•<core::Null>())
     ;
 }
 static method main() → dynamic {
@@ -24,7 +24,3 @@ static method main() → dynamic {
     throw "Unexpected run-time type: `new B().x` is ${x.{core::Object::runtimeType}}, but `_Y<Null>` expected";
   }
 }
-
-constants  {
-  #C1 = self::_Y<core::Null> {}
-}

pkg/front_end/testcases/general/control_flow_collection_inference.dart.legacy.expect

@@ -1784,7 +1784,7 @@ class B extends self::A {
   get foo() → core::int
     return 42;
 }
-static method oracle<T extends core::Object = dynamic>([self::oracle::T t = #C1]) → dynamic
+static method oracle<T extends core::Object = dynamic>([self::oracle::T t = null]) → dynamic
   return true;
 static method testIfElement(dynamic dynVar, core::List<core::int> listInt, core::List<core::double> listDouble, core::Map<core::String, core::int> mapToInt, core::Map<core::String, core::double> mapToDouble) → dynamic {
   dynamic list10 = <dynamic>[];
@@ -2034,7 +2034,3 @@ static method testPromotion(self::A a) → dynamic {
   core::Map<core::int, core::int> map10 = <dynamic, dynamic>{};
 }
 static method main() → dynamic {}
-
-constants  {
-  #C1 = null
-}

pkg/front_end/testcases/general/control_flow_collection_inference.dart.legacy.transformed.expect

@@ -1784,7 +1784,7 @@ class B extends self::A {
   get foo() → core::int
     return 42;
 }
-static method oracle<T extends core::Object = dynamic>([self::oracle::T t = #C1]) → dynamic
+static method oracle<T extends core::Object = dynamic>([self::oracle::T t = null]) → dynamic
   return true;
 static method testIfElement(dynamic dynVar, core::List<core::int> listInt, core::List<core::double> listDouble, core::Map<core::String, core::int> mapToInt, core::Map<core::String, core::double> mapToDouble) → dynamic {
   dynamic list10 = <dynamic>[];
@@ -2057,7 +2057,3 @@ static method testPromotion(self::A a) → dynamic {
   core::Map<core::int, core::int> map10 = <dynamic, dynamic>{};
 }
 static method main() → dynamic {}
-
-constants  {
-  #C1 = null
-}

pkg/front_end/testcases/general/control_flow_collection_inference.dart.strong.expect

@@ -492,7 +492,7 @@ class B extends self::A {
   get foo() → core::int
     return 42;
 }
-static method oracle<T extends core::Object = dynamic>([self::oracle::T t = #C1]) → dynamic
+static method oracle<T extends core::Object = dynamic>([self::oracle::T t = null]) → dynamic
   return true;
 static method testIfElement(dynamic dynVar, core::List<core::int> listInt, core::List<core::double> listDouble, core::Map<core::String, core::int> mapToInt, core::Map<core::String, core::double> mapToDouble) → dynamic {
   core::List<core::int> list10 = block {
@@ -2311,7 +2311,3 @@ static method testPromotion(self::A a) → dynamic {
   } =>#t426;
 }
 static method main() → dynamic {}
-
-constants  {
-  #C1 = null
-}

pkg/front_end/testcases/general/control_flow_collection_inference.dart.strong.transformed.expect

@@ -492,7 +492,7 @@ class B extends self::A {
   get foo() → core::int
     return 42;
 }
-static method oracle<T extends core::Object = dynamic>([self::oracle::T t = #C1]) → dynamic
+static method oracle<T extends core::Object = dynamic>([self::oracle::T t = null]) → dynamic
   return true;
 static method testIfElement(dynamic dynVar, core::List<core::int> listInt, core::List<core::double> listDouble, core::Map<core::String, core::int> mapToInt, core::Map<core::String, core::double> mapToDouble) → dynamic {
   core::List<core::int> list10 = block {
@@ -2462,7 +2462,3 @@ static method testPromotion(self::A a) → dynamic {
   } =>#t444;
 }
 static method main() → dynamic {}
-
-constants  {
-  #C1 = null
-}

pkg/front_end/testcases/general/default_values.dart.legacy.expect

@@ -2,12 +2,8 @@ library;
 import self as self;
 import "dart:core" as core;
 
-static method topLevel([dynamic a = #C1]) → dynamic
+static method topLevel([dynamic a = 42]) → dynamic
   return a;
 static method main() → dynamic {
   core::print(self::topLevel());
 }
-
-constants  {
-  #C1 = 42
-}

pkg/front_end/testcases/general/default_values.dart.legacy.transformed.expect

@@ -2,12 +2,8 @@ library;
 import self as self;
 import "dart:core" as core;
 
-static method topLevel([dynamic a = #C1]) → dynamic
+static method topLevel([dynamic a = 42]) → dynamic
   return a;
 static method main() → dynamic {
   core::print(self::topLevel());
 }
-
-constants  {
-  #C1 = 42
-}

pkg/front_end/testcases/general/default_values.dart.strong.expect

@@ -2,12 +2,8 @@ library;
 import self as self;
 import "dart:core" as core;
 
-static method topLevel([dynamic a = #C1]) → dynamic
+static method topLevel([dynamic a = 42]) → dynamic
   return a;
 static method main() → dynamic {
   core::print(self::topLevel());
 }
-
-constants  {
-  #C1 = 42
-}

pkg/front_end/testcases/general/default_values.dart.strong.transformed.expect

@@ -2,12 +2,8 @@ library;
 import self as self;
 import "dart:core" as core;
 
-static method topLevel([dynamic a = #C1]) → dynamic
+static method topLevel([dynamic a = 42]) → dynamic
   return a;
 static method main() → dynamic {
   core::print(self::topLevel());
 }
-
-constants  {
-  #C1 = 42
-}

pkg/front_end/testcases/general/duplicated_declarations.dart.legacy.expect

@@ -417,7 +417,7 @@ class C extends core::Object {
 }
 class Sub extends core::Object {
   constructor •() → self::Sub
-    : final dynamic #t1 = throw new core::NoSuchMethodError::withInvocation(null, new core::_InvocationMirror::_withType(#C1, 0, #C2, core::List::unmodifiable<dynamic>(<dynamic>[null]), core::Map::unmodifiable<core::Symbol, dynamic>(#C4)))
+    : final dynamic #t1 = throw new core::NoSuchMethodError::withInvocation(null, new core::_InvocationMirror::_withType(#Object, 0, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>[null]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})))
     ;
   method m() → dynamic
     return super.m();
@@ -425,8 +425,8 @@ class Sub extends core::Object {
 class Enum#4 extends core::Object { // from org-dartlang-testcase:///duplicated_declarations_part.dart
   final field core::int index;
   final field core::String _name;
-  static const field core::List<self::Enum#4> values = #C8;
-  static const field self::Enum#4 a = #C7;
+  static const field core::List<self::Enum#4> values = const <self::Enum#4>[self::Enum#4::a];
+  static const field self::Enum#4 a = const self::Enum#4::•(0, "Enum.a");
   const constructor •(core::int index, core::String _name) → self::Enum#4
     : self::Enum#4::index = index, self::Enum#4::_name = _name, super core::Object::•()
     ;
@@ -436,10 +436,10 @@ class Enum#4 extends core::Object { // from org-dartlang-testcase:///duplicated_
 class Enum#3 extends core::Object { // from org-dartlang-testcase:///duplicated_declarations_part.dart
   final field core::int index;
   final field core::String _name;
-  static const field core::List<self::Enum#3> values = #C16;
-  static const field self::Enum#3 a = #C9;
-  static const field self::Enum#3 b = #C12;
-  static const field self::Enum#3 c = #C15;
+  static const field core::List<self::Enum#3> values = const <self::Enum#3>[self::Enum#3::a, self::Enum#3::b, self::Enum#3::c];
+  static const field self::Enum#3 a = const self::Enum#3::•(0, "Enum.a");
+  static const field self::Enum#3 b = const self::Enum#3::•(1, "Enum.b");
+  static const field self::Enum#3 c = const self::Enum#3::•(2, "Enum.c");
   const constructor •(core::int index, core::String _name) → self::Enum#3
     : self::Enum#3::index = index, self::Enum#3::_name = _name, super core::Object::•()
     ;
@@ -449,10 +449,10 @@ class Enum#3 extends core::Object { // from org-dartlang-testcase:///duplicated_
 class Enum#2 extends core::Object { // from org-dartlang-testcase:///duplicated_declarations_part.dart
   final field core::int index;
   final field core::String _name;
-  static const field core::List<self::Enum#2> values = #C21;
-  static const field self::Enum#2 Enum = #C18;
-  static const field self::Enum#2 a = #C19;
-  static const field self::Enum#2 b = #C20;
+  static const field core::List<self::Enum#2> values = const <self::Enum#2>[self::Enum#2::Enum, self::Enum#2::a, self::Enum#2::b];
+  static const field self::Enum#2 Enum = const self::Enum#2::•(0, "Enum.Enum");
+  static const field self::Enum#2 a = const self::Enum#2::•(1, "Enum.a");
+  static const field self::Enum#2 b = const self::Enum#2::•(2, "Enum.b");
   const constructor •(core::int index, core::String _name) → self::Enum#2
     : self::Enum#2::index = index, self::Enum#2::_name = _name, super core::Object::•()
     ;
@@ -462,10 +462,10 @@ class Enum#2 extends core::Object { // from org-dartlang-testcase:///duplicated_
 class Enum#1 extends core::Object {
   final field core::int index;
   final field core::String _name;
-  static const field core::List<self::Enum#1> values = #C25;
-  static const field self::Enum#1 a = #C22;
-  static const field self::Enum#1 b = #C23;
-  static const field self::Enum#1 c = #C24;
+  static const field core::List<self::Enum#1> values = const <self::Enum#1>[self::Enum#1::a, self::Enum#1::b, self::Enum#1::c];
+  static const field self::Enum#1 a = const self::Enum#1::•(0, "Enum.a");
+  static const field self::Enum#1 b = const self::Enum#1::•(1, "Enum.b");
+  static const field self::Enum#1 c = const self::Enum#1::•(2, "Enum.c");
   const constructor •(core::int index, core::String _name) → self::Enum#1
     : self::Enum#1::index = index, self::Enum#1::_name = _name, super core::Object::•()
     ;
@@ -475,10 +475,10 @@ class Enum#1 extends core::Object {
 class Enum extends core::Object {
   final field core::int index;
   final field core::String _name;
-  static const field core::List<self::Enum> values = #C29;
-  static const field self::Enum Enum = #C26;
-  static const field self::Enum a = #C27;
-  static const field self::Enum b = #C28;
+  static const field core::List<self::Enum> values = const <self::Enum>[self::Enum::Enum, self::Enum::a, self::Enum::b];
+  static const field self::Enum Enum = const self::Enum::•(0, "Enum.Enum");
+  static const field self::Enum a = const self::Enum::•(1, "Enum.a");
+  static const field self::Enum b = const self::Enum::•(2, "Enum.b");
   const constructor •(core::int index, core::String _name) → self::Enum
     : self::Enum::index = index, self::Enum::_name = _name, super core::Object::•()
     ;
@@ -488,10 +488,10 @@ class Enum extends core::Object {
 class AnotherEnum extends core::Object {
   final field core::int index;
   final field core::String _name;
-  static const field core::List<self::AnotherEnum> values = #C36;
-  static const field self::AnotherEnum a = #C31;
-  static const field self::AnotherEnum b = #C33;
-  static const field self::AnotherEnum c = #C35;
+  static const field core::List<self::AnotherEnum> values = const <self::AnotherEnum>[self::AnotherEnum::a, self::AnotherEnum::b, self::AnotherEnum::c];
+  static const field self::AnotherEnum a = const self::AnotherEnum::•(0, "AnotherEnum.a");
+  static const field self::AnotherEnum b = const self::AnotherEnum::•(1, "AnotherEnum.b");
+  static const field self::AnotherEnum c = const self::AnotherEnum::•(2, "AnotherEnum.c");
   const constructor •(core::int index, core::String _name) → self::AnotherEnum
     : self::AnotherEnum::index = index, self::AnotherEnum::_name = _name, super core::Object::•()
     ;
@@ -514,7 +514,7 @@ static method foo() → dynamic {
   ^".s();
 }
 static method useAnotherEnum() → dynamic {
-  <core::String, core::Object>{"AnotherEnum.a": #C31, "AnotherEnum.b": #C33, "AnotherEnum.c": #C35, "AnotherEnum._name": invalid-expression "pkg/front_end/testcases/general/duplicated_declarations.dart:102:38: Error: Can't use '_name' because it is declared more than once.
+  <core::String, core::Object>{"AnotherEnum.a": self::AnotherEnum::a, "AnotherEnum.b": self::AnotherEnum::b, "AnotherEnum.c": self::AnotherEnum::c, "AnotherEnum._name": invalid-expression "pkg/front_end/testcases/general/duplicated_declarations.dart:102:38: Error: Can't use '_name' because it is declared more than once.
     \"AnotherEnum._name\": AnotherEnum._name,
                                      ^^^^^", "AnotherEnum.index": invalid-expression "pkg/front_end/testcases/general/duplicated_declarations.dart:103:38: Error: Can't use 'index' because it is declared more than once.
     \"AnotherEnum.index\": AnotherEnum.index,
@@ -527,43 +527,3 @@ static method useAnotherEnum() → dynamic {
 
 library;
 import self as self2;
-
-
-constants  {
-  #C1 = #Object
-  #C2 = <core::Type>[]
-  #C3 = <dynamic>[]
-  #C4 = core::_ImmutableMap<core::Symbol, dynamic> {_kvPairs:#C3}
-  #C5 = 0
-  #C6 = "Enum.a"
-  #C7 = self::Enum#4 {index:#C5, _name:#C6}
-  #C8 = <self::Enum#4>[#C7]
-  #C9 = self::Enum#3 {index:#C5, _name:#C6}
-  #C10 = 1
-  #C11 = "Enum.b"
-  #C12 = self::Enum#3 {index:#C10, _name:#C11}
-  #C13 = 2
-  #C14 = "Enum.c"
-  #C15 = self::Enum#3 {index:#C13, _name:#C14}
-  #C16 = <self::Enum#3>[#C9, #C12, #C15]
-  #C17 = "Enum.Enum"
-  #C18 = self::Enum#2 {index:#C5, _name:#C17}
-  #C19 = self::Enum#2 {index:#C10, _name:#C6}
-  #C20 = self::Enum#2 {index:#C13, _name:#C11}
-  #C21 = <self::Enum#2>[#C18, #C19, #C20]
-  #C22 = self::Enum#1 {index:#C5, _name:#C6}
-  #C23 = self::Enum#1 {index:#C10, _name:#C11}
-  #C24 = self::Enum#1 {index:#C13, _name:#C14}
-  #C25 = <self::Enum#1>[#C22, #C23, #C24]
-  #C26 = self::Enum {index:#C5, _name:#C17}
-  #C27 = self::Enum {index:#C10, _name:#C6}
-  #C28 = self::Enum {index:#C13, _name:#C11}
-  #C29 = <self::Enum>[#C26, #C27, #C28]
-  #C30 = "AnotherEnum.a"
-  #C31 = self::AnotherEnum {index:#C5, _name:#C30}
-  #C32 = "AnotherEnum.b"
-  #C33 = self::AnotherEnum {index:#C10, _name:#C32}
-  #C34 = "AnotherEnum.c"
-  #C35 = self::AnotherEnum {index:#C13, _name:#C34}
-  #C36 = <self::AnotherEnum>[#C31, #C33, #C35]
-}

pkg/front_end/testcases/general/duplicated_declarations.dart.legacy.transformed.expect

@@ -417,7 +417,7 @@ class C extends core::Object {
 }
 class Sub extends core::Object {
   constructor •() → self::Sub
-    : final dynamic #t1 = throw new core::NoSuchMethodError::withInvocation(null, new core::_InvocationMirror::_withType(#C1, 0, #C2, core::List::unmodifiable<dynamic>(<dynamic>[null]), core::Map::unmodifiable<core::Symbol, dynamic>(#C4)))
+    : final dynamic #t1 = throw new core::NoSuchMethodError::withInvocation(null, new core::_InvocationMirror::_withType(#Object, 0, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>[null]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})))
     ;
   method m() → dynamic
     return super.m();
@@ -425,8 +425,8 @@ class Sub extends core::Object {
 class Enum#4 extends core::Object { // from org-dartlang-testcase:///duplicated_declarations_part.dart
   final field core::int index;
   final field core::String _name;
-  static const field core::List<self::Enum#4> values = #C8;
-  static const field self::Enum#4 a = #C7;
+  static const field core::List<self::Enum#4> values = const <self::Enum#4>[self::Enum#4::a];
+  static const field self::Enum#4 a = const self::Enum#4::•(0, "Enum.a");
   const constructor •(core::int index, core::String _name) → self::Enum#4
     : self::Enum#4::index = index, self::Enum#4::_name = _name, super core::Object::•()
     ;
@@ -436,10 +436,10 @@ class Enum#4 extends core::Object { // from org-dartlang-testcase:///duplicated_
 class Enum#3 extends core::Object { // from org-dartlang-testcase:///duplicated_declarations_part.dart
   final field core::int index;
   final field core::String _name;
-  static const field core::List<self::Enum#3> values = #C16;
-  static const field self::Enum#3 a = #C9;
-  static const field self::Enum#3 b = #C12;
-  static const field self::Enum#3 c = #C15;
+  static const field core::List<self::Enum#3> values = const <self::Enum#3>[self::Enum#3::a, self::Enum#3::b, self::Enum#3::c];
+  static const field self::Enum#3 a = const self::Enum#3::•(0, "Enum.a");
+  static const field self::Enum#3 b = const self::Enum#3::•(1, "Enum.b");
+  static const field self::Enum#3 c = const self::Enum#3::•(2, "Enum.c");
   const constructor •(core::int index, core::String _name) → self::Enum#3
     : self::Enum#3::index = index, self::Enum#3::_name = _name, super core::Object::•()
     ;
@@ -449,10 +449,10 @@ class Enum#3 extends core::Object { // from org-dartlang-testcase:///duplicated_
 class Enum#2 extends core::Object { // from org-dartlang-testcase:///duplicated_declarations_part.dart
   final field core::int index;
   final field core::String _name;
-  static const field core::List<self::Enum#2> values = #C21;
-  static const field self::Enum#2 Enum = #C18;
-  static const field self::Enum#2 a = #C19;
-  static const field self::Enum#2 b = #C20;
+  static const field core::List<self::Enum#2> values = const <self::Enum#2>[self::Enum#2::Enum, self::Enum#2::a, self::Enum#2::b];
+  static const field self::Enum#2 Enum = const self::Enum#2::•(0, "Enum.Enum");
+  static const field self::Enum#2 a = const self::Enum#2::•(1, "Enum.a");
+  static const field self::Enum#2 b = const self::Enum#2::•(2, "Enum.b");
   const constructor •(core::int index, core::String _name) → self::Enum#2
     : self::Enum#2::index = index, self::Enum#2::_name = _name, super core::Object::•()
     ;
@@ -462,10 +462,10 @@ class Enum#2 extends core::Object { // from org-dartlang-testcase:///duplicated_
 class Enum#1 extends core::Object {
   final field core::int index;
   final field core::String _name;
-  static const field core::List<self::Enum#1> values = #C25;
-  static const field self::Enum#1 a = #C22;
-  static const field self::Enum#1 b = #C23;
-  static const field self::Enum#1 c = #C24;
+  static const field core::List<self::Enum#1> values = const <self::Enum#1>[self::Enum#1::a, self::Enum#1::b, self::Enum#1::c];
+  static const field self::Enum#1 a = const self::Enum#1::•(0, "Enum.a");
+  static const field self::Enum#1 b = const self::Enum#1::•(1, "Enum.b");
+  static const field self::Enum#1 c = const self::Enum#1::•(2, "Enum.c");
   const constructor •(core::int index, core::String _name) → self::Enum#1
     : self::Enum#1::index = index, self::Enum#1::_name = _name, super core::Object::•()
     ;
@@ -475,10 +475,10 @@ class Enum#1 extends core::Object {
 class Enum extends core::Object {
   final field core::int index;
   final field core::String _name;
-  static const field core::List<self::Enum> values = #C29;
-  static const field self::Enum Enum = #C26;
-  static const field self::Enum a = #C27;
-  static const field self::Enum b = #C28;
+  static const field core::List<self::Enum> values = const <self::Enum>[self::Enum::Enum, self::Enum::a, self::Enum::b];
+  static const field self::Enum Enum = const self::Enum::•(0, "Enum.Enum");
+  static const field self::Enum a = const self::Enum::•(1, "Enum.a");
+  static const field self::Enum b = const self::Enum::•(2, "Enum.b");
   const constructor •(core::int index, core::String _name) → self::Enum
     : self::Enum::index = index, self::Enum::_name = _name, super core::Object::•()
     ;
@@ -488,10 +488,10 @@ class Enum extends core::Object {
 class AnotherEnum extends core::Object {
   final field core::int index;
   final field core::String _name;
-  static const field core::List<self::AnotherEnum> values = #C36;
-  static const field self::AnotherEnum a = #C31;
-  static const field self::AnotherEnum b = #C33;
-  static const field self::AnotherEnum c = #C35;
+  static const field core::List<self::AnotherEnum> values = const <self::AnotherEnum>[self::AnotherEnum::a, self::AnotherEnum::b, self::AnotherEnum::c];
+  static const field self::AnotherEnum a = const self::AnotherEnum::•(0, "AnotherEnum.a");
+  static const field self::AnotherEnum b = const self::AnotherEnum::•(1, "AnotherEnum.b");
+  static const field self::AnotherEnum c = const self::AnotherEnum::•(2, "AnotherEnum.c");
   const constructor •(core::int index, core::String _name) → self::AnotherEnum
     : self::AnotherEnum::index = index, self::AnotherEnum::_name = _name, super core::Object::•()
     ;
@@ -514,7 +514,7 @@ static method foo() → dynamic {
   ^".s();
 }
 static method useAnotherEnum() → dynamic {
-  <core::String, core::Object>{"AnotherEnum.a": #C31, "AnotherEnum.b": #C33, "AnotherEnum.c": #C35, "AnotherEnum._name": invalid-expression "pkg/front_end/testcases/general/duplicated_declarations.dart:102:38: Error: Can't use '_name' because it is declared more than once.
+  <core::String, core::Object>{"AnotherEnum.a": self::AnotherEnum::a, "AnotherEnum.b": self::AnotherEnum::b, "AnotherEnum.c": self::AnotherEnum::c, "AnotherEnum._name": invalid-expression "pkg/front_end/testcases/general/duplicated_declarations.dart:102:38: Error: Can't use '_name' because it is declared more than once.
     \"AnotherEnum._name\": AnotherEnum._name,
                                      ^^^^^", "AnotherEnum.index": invalid-expression "pkg/front_end/testcases/general/duplicated_declarations.dart:103:38: Error: Can't use 'index' because it is declared more than once.
     \"AnotherEnum.index\": AnotherEnum.index,
@@ -527,43 +527,3 @@ static method useAnotherEnum() → dynamic {
 
 library;
 import self as self2;
-
-
-constants  {
-  #C1 = #Object
-  #C2 = <core::Type>[]
-  #C3 = <dynamic>[]
-  #C4 = core::_ImmutableMap<core::Symbol, dynamic> {_kvPairs:#C3}
-  #C5 = 0
-  #C6 = "Enum.a"
-  #C7 = self::Enum#4 {index:#C5, _name:#C6}
-  #C8 = <self::Enum#4>[#C7]
-  #C9 = self::Enum#3 {index:#C5, _name:#C6}
-  #C10 = 1
-  #C11 = "Enum.b"
-  #C12 = self::Enum#3 {index:#C10, _name:#C11}
-  #C13 = 2
-  #C14 = "Enum.c"
-  #C15 = self::Enum#3 {index:#C13, _name:#C14}
-  #C16 = <self::Enum#3>[#C9, #C12, #C15]
-  #C17 = "Enum.Enum"
-  #C18 = self::Enum#2 {index:#C5, _name:#C17}
-  #C19 = self::Enum#2 {index:#C10, _name:#C6}
-  #C20 = self::Enum#2 {index:#C13, _name:#C11}
-  #C21 = <self::Enum#2>[#C18, #C19, #C20]
-  #C22 = self::Enum#1 {index:#C5, _name:#C6}
-  #C23 = self::Enum#1 {index:#C10, _name:#C11}
-  #C24 = self::Enum#1 {index:#C13, _name:#C14}
-  #C25 = <self::Enum#1>[#C22, #C23, #C24]
-  #C26 = self::Enum {index:#C5, _name:#C17}
-  #C27 = self::Enum {index:#C10, _name:#C6}
-  #C28 = self::Enum {index:#C13, _name:#C11}
-  #C29 = <self::Enum>[#C26, #C27, #C28]
-  #C30 = "AnotherEnum.a"
-  #C31 = self::AnotherEnum {index:#C5, _name:#C30}
-  #C32 = "AnotherEnum.b"
-  #C33 = self::AnotherEnum {index:#C10, _name:#C32}
-  #C34 = "AnotherEnum.c"
-  #C35 = self::AnotherEnum {index:#C13, _name:#C34}
-  #C36 = <self::AnotherEnum>[#C31, #C33, #C35]
-}

pkg/front_end/testcases/general/duplicated_declarations.dart.strong.expect

@@ -428,8 +428,8 @@ Try removing the extra positional arguments.
 class Enum#4 extends core::Object { // from org-dartlang-testcase:///duplicated_declarations_part.dart
   final field core::int index;
   final field core::String _name;
-  static const field core::List<self::Enum#4> values = #C4;
-  static const field self::Enum#4 a = #C3;
+  static const field core::List<self::Enum#4> values = const <self::Enum#4>[self::Enum#4::a];
+  static const field self::Enum#4 a = const self::Enum#4::•(0, "Enum.a");
   const constructor •(core::int index, core::String _name) → self::Enum#4
     : self::Enum#4::index = index, self::Enum#4::_name = _name, super core::Object::•()
     ;
@@ -439,10 +439,10 @@ class Enum#4 extends core::Object { // from org-dartlang-testcase:///duplicated_
 class Enum#3 extends core::Object { // from org-dartlang-testcase:///duplicated_declarations_part.dart
   final field core::int index;
   final field core::String _name;
-  static const field core::List<self::Enum#3> values = #C12;
-  static const field self::Enum#3 a = #C5;
-  static const field self::Enum#3 b = #C8;
-  static const field self::Enum#3 c = #C11;
+  static const field core::List<self::Enum#3> values = const <self::Enum#3>[self::Enum#3::a, self::Enum#3::b, self::Enum#3::c];
+  static const field self::Enum#3 a = const self::Enum#3::•(0, "Enum.a");
+  static const field self::Enum#3 b = const self::Enum#3::•(1, "Enum.b");
+  static const field self::Enum#3 c = const self::Enum#3::•(2, "Enum.c");
   const constructor •(core::int index, core::String _name) → self::Enum#3
     : self::Enum#3::index = index, self::Enum#3::_name = _name, super core::Object::•()
     ;
@@ -452,10 +452,10 @@ class Enum#3 extends core::Object { // from org-dartlang-testcase:///duplicated_
 class Enum#2 extends core::Object { // from org-dartlang-testcase:///duplicated_declarations_part.dart
   final field core::int index;
   final field core::String _name;
-  static const field core::List<self::Enum#2> values = #C17;
-  static const field self::Enum#2 Enum = #C14;
-  static const field self::Enum#2 a = #C15;
-  static const field self::Enum#2 b = #C16;
+  static const field core::List<self::Enum#2> values = const <self::Enum#2>[self::Enum#2::Enum, self::Enum#2::a, self::Enum#2::b];
+  static const field self::Enum#2 Enum = const self::Enum#2::•(0, "Enum.Enum");
+  static const field self::Enum#2 a = const self::Enum#2::•(1, "Enum.a");
+  static const field self::Enum#2 b = const self::Enum#2::•(2, "Enum.b");
   const constructor •(core::int index, core::String _name) → self::Enum#2
     : self::Enum#2::index = index, self::Enum#2::_name = _name, super core::Object::•()
     ;
@@ -465,10 +465,10 @@ class Enum#2 extends core::Object { // from org-dartlang-testcase:///duplicated_
 class Enum#1 extends core::Object {
   final field core::int index;
   final field core::String _name;
-  static const field core::List<self::Enum#1> values = #C21;
-  static const field self::Enum#1 a = #C18;
-  static const field self::Enum#1 b = #C19;
-  static const field self::Enum#1 c = #C20;
+  static const field core::List<self::Enum#1> values = const <self::Enum#1>[self::Enum#1::a, self::Enum#1::b, self::Enum#1::c];
+  static const field self::Enum#1 a = const self::Enum#1::•(0, "Enum.a");
+  static const field self::Enum#1 b = const self::Enum#1::•(1, "Enum.b");
+  static const field self::Enum#1 c = const self::Enum#1::•(2, "Enum.c");
   const constructor •(core::int index, core::String _name) → self::Enum#1
     : self::Enum#1::index = index, self::Enum#1::_name = _name, super core::Object::•()
     ;
@@ -478,10 +478,10 @@ class Enum#1 extends core::Object {
 class Enum extends core::Object {
   final field core::int index;
   final field core::String _name;
-  static const field core::List<self::Enum> values = #C25;
-  static const field self::Enum Enum = #C22;
-  static const field self::Enum a = #C23;
-  static const field self::Enum b = #C24;
+  static const field core::List<self::Enum> values = const <self::Enum>[self::Enum::Enum, self::Enum::a, self::Enum::b];
+  static const field self::Enum Enum = const self::Enum::•(0, "Enum.Enum");
+  static const field self::Enum a = const self::Enum::•(1, "Enum.a");
+  static const field self::Enum b = const self::Enum::•(2, "Enum.b");
   const constructor •(core::int index, core::String _name) → self::Enum
     : self::Enum::index = index, self::Enum::_name = _name, super core::Object::•()
     ;
@@ -491,10 +491,10 @@ class Enum extends core::Object {
 class AnotherEnum extends core::Object {
   final field core::int index;
   final field core::String _name;
-  static const field core::List<self::AnotherEnum> values = #C32;
-  static const field self::AnotherEnum a = #C27;
-  static const field self::AnotherEnum b = #C29;
-  static const field self::AnotherEnum c = #C31;
+  static const field core::List<self::AnotherEnum> values = const <self::AnotherEnum>[self::AnotherEnum::a, self::AnotherEnum::b, self::AnotherEnum::c];
+  static const field self::AnotherEnum a = const self::AnotherEnum::•(0, "AnotherEnum.a");
+  static const field self::AnotherEnum b = const self::AnotherEnum::•(1, "AnotherEnum.b");
+  static const field self::AnotherEnum c = const self::AnotherEnum::•(2, "AnotherEnum.c");
   const constructor •(core::int index, core::String _name) → self::AnotherEnum
     : self::AnotherEnum::index = index, self::AnotherEnum::_name = _name, super core::Object::•()
     ;
@@ -517,7 +517,7 @@ static method foo() → dynamic {
   ^".s();
 }
 static method useAnotherEnum() → dynamic {
-  <core::String, core::Object>{"AnotherEnum.a": #C27, "AnotherEnum.b": #C29, "AnotherEnum.c": #C31, "AnotherEnum._name": invalid-expression "pkg/front_end/testcases/general/duplicated_declarations.dart:102:38: Error: Can't use '_name' because it is declared more than once.
+  <core::String, core::Object>{"AnotherEnum.a": self::AnotherEnum::a, "AnotherEnum.b": self::AnotherEnum::b, "AnotherEnum.c": self::AnotherEnum::c, "AnotherEnum._name": invalid-expression "pkg/front_end/testcases/general/duplicated_declarations.dart:102:38: Error: Can't use '_name' because it is declared more than once.
     \"AnotherEnum._name\": AnotherEnum._name,
                                      ^^^^^", "AnotherEnum.index": invalid-expression "pkg/front_end/testcases/general/duplicated_declarations.dart:103:38: Error: Can't use 'index' because it is declared more than once.
     \"AnotherEnum.index\": AnotherEnum.index,
@@ -530,39 +530,3 @@ static method useAnotherEnum() → dynamic {
 
 library;
 import self as self2;
-
-
-constants  {
-  #C1 = 0
-  #C2 = "Enum.a"
-  #C3 = self::Enum#4 {index:#C1, _name:#C2}
-  #C4 = <self::Enum#4>[#C3]
-  #C5 = self::Enum#3 {index:#C1, _name:#C2}
-  #C6 = 1
-  #C7 = "Enum.b"
-  #C8 = self::Enum#3 {index:#C6, _name:#C7}
-  #C9 = 2
-  #C10 = "Enum.c"
-  #C11 = self::Enum#3 {index:#C9, _name:#C10}
-  #C12 = <self::Enum#3>[#C5, #C8, #C11]
-  #C13 = "Enum.Enum"
-  #C14 = self::Enum#2 {index:#C1, _name:#C13}
-  #C15 = self::Enum#2 {index:#C6, _name:#C2}
-  #C16 = self::Enum#2 {index:#C9, _name:#C7}
-  #C17 = <self::Enum#2>[#C14, #C15, #C16]
-  #C18 = self::Enum#1 {index:#C1, _name:#C2}
-  #C19 = self::Enum#1 {index:#C6, _name:#C7}
-  #C20 = self::Enum#1 {index:#C9, _name:#C10}
-  #C21 = <self::Enum#1>[#C18, #C19, #C20]
-  #C22 = self::Enum {index:#C1, _name:#C13}
-  #C23 = self::Enum {index:#C6, _name:#C2}
-  #C24 = self::Enum {index:#C9, _name:#C7}
-  #C25 = <self::Enum>[#C22, #C23, #C24]
-  #C26 = "AnotherEnum.a"
-  #C27 = self::AnotherEnum {index:#C1, _name:#C26}
-  #C28 = "AnotherEnum.b"
-  #C29 = self::AnotherEnum {index:#C6, _name:#C28}
-  #C30 = "AnotherEnum.c"
-  #C31 = self::AnotherEnum {index:#C9, _name:#C30}
-  #C32 = <self::AnotherEnum>[#C27, #C29, #C31]
-}

pkg/front_end/testcases/general/duplicated_named_args_3.dart.legacy.expect

@@ -6,13 +6,9 @@ class C extends core::Object {
   synthetic constructor •() → self::C
     : super core::Object::•()
     ;
-  static method m({core::int a = #C1}) → dynamic {}
+  static method m({core::int a = 0}) → dynamic {}
 }
 static method test() → void {
   self::C::m(a: 1, a: 2, a: 3);
 }
 static method main() → dynamic {}
-
-constants  {
-  #C1 = 0
-}

pkg/front_end/testcases/general/duplicated_named_args_3.dart.legacy.transformed.expect

@@ -6,13 +6,9 @@ class C extends core::Object {
   synthetic constructor •() → self::C
     : super core::Object::•()
     ;
-  static method m({core::int a = #C1}) → dynamic {}
+  static method m({core::int a = 0}) → dynamic {}
 }
 static method test() → void {
   self::C::m(a: 1, a: 2, a: 3);
 }
 static method main() → dynamic {}
-
-constants  {
-  #C1 = 0
-}

pkg/front_end/testcases/general/duplicated_named_args_3.dart.strong.expect

@@ -17,7 +17,7 @@ class C extends core::Object {
   synthetic constructor •() → self::C
     : super core::Object::•()
     ;
-  static method m({core::int a = #C1}) → dynamic {}
+  static method m({core::int a = 0}) → dynamic {}
 }
 static method test() → void {
   self::C::m(a: invalid-expression "pkg/front_end/testcases/general/duplicated_named_args_3.dart:13:19: Error: Duplicated named argument 'a'.
@@ -25,7 +25,3 @@ static method test() → void {
                   ^");
 }
 static method main() → dynamic {}
-
-constants  {
-  #C1 = 0
-}

pkg/front_end/testcases/general/duplicated_named_args_3.dart.strong.transformed.expect

@@ -17,7 +17,7 @@ class C extends core::Object {
   synthetic constructor •() → self::C
     : super core::Object::•()
     ;
-  static method m({core::int a = #C1}) → dynamic {}
+  static method m({core::int a = 0}) → dynamic {}
 }
 static method test() → void {
   self::C::m(a: invalid-expression "pkg/front_end/testcases/general/duplicated_named_args_3.dart:13:19: Error: Duplicated named argument 'a'.
@@ -25,7 +25,3 @@ static method test() → void {
                   ^");
 }
 static method main() → dynamic {}
-
-constants  {
-  #C1 = 0
-}

pkg/front_end/testcases/general/expressions.dart.legacy.expect

@@ -9,7 +9,7 @@ library;
 import self as self;
 import "dart:core" as core;
 
-static method foo({dynamic fisk = #C1}) → dynamic {
+static method foo({dynamic fisk = null}) → dynamic {
   core::print(fisk);
 }
 static method caller(dynamic f) → dynamic {
@@ -48,7 +48,7 @@ static method main() → dynamic {
   core::print(let final dynamic #t1 = i in let final dynamic #t2 = i = #t1.-(1) in #t1);
   core::print(let final dynamic #t3 = i in let final dynamic #t4 = i = #t3.+(1) in #t3);
   core::print(new core::Object::•());
-  core::print(#C2);
+  core::print(const core::Object::•());
   core::print(core::List::•<core::String>(2).runtimeType);
   self::foo(fisk: "Blorp gulp");
   function f() → dynamic {
@@ -58,25 +58,25 @@ static method main() → dynamic {
   self::caller(() → dynamic {
     core::print("<anon> was called");
   });
-  function g([dynamic message = #C1]) → dynamic {
+  function g([dynamic message = null]) → dynamic {
     core::print(message);
   }
   g.call("Hello, World");
-  self::caller(([dynamic x = #C1]) → dynamic {
+  self::caller(([dynamic x = null]) → dynamic {
     core::print("<anon> was called with ${x}");
   });
-  function h({dynamic message = #C1}) → dynamic {
+  function h({dynamic message = null}) → dynamic {
     core::print(message);
   }
   h.call(message: "Hello, World");
-  self::caller(({dynamic x = #C1}) → dynamic {
+  self::caller(({dynamic x = null}) → dynamic {
     core::print("<anon> was called with ${x}");
   });
   core::print(core::int.toString());
   core::print(core::int);
   core::print(let final dynamic #t5 = core::int in let final dynamic #t6 = #t5.toString() in #t5);
   try {
-    core::print(throw new core::NoSuchMethodError::withInvocation(null, new core::_InvocationMirror::_withType(#C3, 32, #C4, #C5, core::Map::unmodifiable<core::Symbol, dynamic>(#C6))));
+    core::print(throw new core::NoSuchMethodError::withInvocation(null, new core::_InvocationMirror::_withType(#int.toString, 32, const <core::Type>[], const <dynamic>[], core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{}))));
     throw "Shouldn't work";
   }
   on core::NoSuchMethodError catch(final core::NoSuchMethodError e) {
@@ -84,12 +84,3 @@ static method main() → dynamic {
   }
   core::print(core::int::parse("42"));
 }
-
-constants  {
-  #C1 = null
-  #C2 = core::Object {}
-  #C3 = #int.toString
-  #C4 = <core::Type>[]
-  #C5 = <dynamic>[]
-  #C6 = core::_ImmutableMap<core::Symbol, dynamic> {_kvPairs:#C5}
-}

pkg/front_end/testcases/general/expressions.dart.legacy.transformed.expect

@@ -9,7 +9,7 @@ library;
 import self as self;
 import "dart:core" as core;
 
-static method foo({dynamic fisk = #C1}) → dynamic {
+static method foo({dynamic fisk = null}) → dynamic {
   core::print(fisk);
 }
 static method caller(dynamic f) → dynamic {
@@ -48,7 +48,7 @@ static method main() → dynamic {
   core::print(let final dynamic #t1 = i in let final dynamic #t2 = i = #t1.-(1) in #t1);
   core::print(let final dynamic #t3 = i in let final dynamic #t4 = i = #t3.+(1) in #t3);
   core::print(new core::Object::•());
-  core::print(#C2);
+  core::print(const core::Object::•());
   core::print(core::_List::•<core::String>(2).runtimeType);
   self::foo(fisk: "Blorp gulp");
   function f() → dynamic {
@@ -58,25 +58,25 @@ static method main() → dynamic {
   self::caller(() → dynamic {
     core::print("<anon> was called");
   });
-  function g([dynamic message = #C1]) → dynamic {
+  function g([dynamic message = null]) → dynamic {
     core::print(message);
   }
   g.call("Hello, World");
-  self::caller(([dynamic x = #C1]) → dynamic {
+  self::caller(([dynamic x = null]) → dynamic {
     core::print("<anon> was called with ${x}");
   });
-  function h({dynamic message = #C1}) → dynamic {
+  function h({dynamic message = null}) → dynamic {
     core::print(message);
   }
   h.call(message: "Hello, World");
-  self::caller(({dynamic x = #C1}) → dynamic {
+  self::caller(({dynamic x = null}) → dynamic {
     core::print("<anon> was called with ${x}");
   });
   core::print(core::int.toString());
   core::print(core::int);
   core::print(let final dynamic #t5 = core::int in let final dynamic #t6 = #t5.toString() in #t5);
   try {
-    core::print(throw new core::NoSuchMethodError::withInvocation(null, new core::_InvocationMirror::_withType(#C3, 32, #C4, #C5, core::Map::unmodifiable<core::Symbol, dynamic>(#C6))));
+    core::print(throw new core::NoSuchMethodError::withInvocation(null, new core::_InvocationMirror::_withType(#int.toString, 32, const <core::Type>[], const <dynamic>[], core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{}))));
     throw "Shouldn't work";
   }
   on core::NoSuchMethodError catch(final core::NoSuchMethodError e) {
@@ -84,12 +84,3 @@ static method main() → dynamic {
   }
   core::print(core::int::parse("42"));
 }
-
-constants  {
-  #C1 = null
-  #C2 = core::Object {}
-  #C3 = #int.toString
-  #C4 = <core::Type>[]
-  #C5 = <dynamic>[]
-  #C6 = core::_ImmutableMap<core::Symbol, dynamic> {_kvPairs:#C5}
-}

pkg/front_end/testcases/general/expressions.dart.strong.expect

@@ -9,7 +9,7 @@ library;
 import self as self;
 import "dart:core" as core;
 
-static method foo({dynamic fisk = #C1}) → dynamic {
+static method foo({dynamic fisk = null}) → dynamic {
   core::print(fisk);
 }
 static method caller(dynamic f) → dynamic {
@@ -48,7 +48,7 @@ static method main() → dynamic {
   core::print(let final core::int #t1 = i in let final core::int #t2 = i = #t1.{core::num::-}(1) in #t1);
   core::print(let final core::int #t3 = i in let final core::int #t4 = i = #t3.{core::num::+}(1) in #t3);
   core::print(new core::Object::•());
-  core::print(#C2);
+  core::print(const core::Object::•());
   core::print(core::List::•<core::String>(2).{core::Object::runtimeType});
   self::foo(fisk: "Blorp gulp");
   function f() → core::Null {
@@ -58,18 +58,18 @@ static method main() → dynamic {
   self::caller(() → core::Null {
     core::print("<anon> was called");
   });
-  function g([dynamic message = #C1]) → core::Null {
+  function g([dynamic message = null]) → core::Null {
     core::print(message);
   }
   g.call("Hello, World");
-  self::caller(([dynamic x = #C1]) → core::Null {
+  self::caller(([dynamic x = null]) → core::Null {
     core::print("<anon> was called with ${x}");
   });
-  function h({dynamic message = #C1}) → core::Null {
+  function h({dynamic message = null}) → core::Null {
     core::print(message);
   }
   h.call(message: "Hello, World");
-  self::caller(({dynamic x = #C1}) → core::Null {
+  self::caller(({dynamic x = null}) → core::Null {
     core::print("<anon> was called with ${x}");
   });
   core::print(core::int.{core::Object::toString}());
@@ -86,8 +86,3 @@ static method main() → dynamic {
   }
   core::print(core::int::parse("42"));
 }
-
-constants  {
-  #C1 = null
-  #C2 = core::Object {}
-}

pkg/front_end/testcases/general/expressions.dart.strong.transformed.expect

@@ -9,7 +9,7 @@ library;
 import self as self;
 import "dart:core" as core;
 
-static method foo({dynamic fisk = #C1}) → dynamic {
+static method foo({dynamic fisk = null}) → dynamic {
   core::print(fisk);
 }
 static method caller(dynamic f) → dynamic {
@@ -48,7 +48,7 @@ static method main() → dynamic {
   core::print(let final core::int #t1 = i in let final core::int #t2 = i = #t1.{core::num::-}(1) in #t1);
   core::print(let final core::int #t3 = i in let final core::int #t4 = i = #t3.{core::num::+}(1) in #t3);
   core::print(new core::Object::•());
-  core::print(#C2);
+  core::print(const core::Object::•());
   core::print(core::_List::•<core::String>(2).{core::Object::runtimeType});
   self::foo(fisk: "Blorp gulp");
   function f() → core::Null {
@@ -58,18 +58,18 @@ static method main() → dynamic {
   self::caller(() → core::Null {
     core::print("<anon> was called");
   });
-  function g([dynamic message = #C1]) → core::Null {
+  function g([dynamic message = null]) → core::Null {
     core::print(message);
   }
   g.call("Hello, World");
-  self::caller(([dynamic x = #C1]) → core::Null {
+  self::caller(([dynamic x = null]) → core::Null {
     core::print("<anon> was called with ${x}");
   });
-  function h({dynamic message = #C1}) → core::Null {
+  function h({dynamic message = null}) → core::Null {
     core::print(message);
   }
   h.call(message: "Hello, World");
-  self::caller(({dynamic x = #C1}) → core::Null {
+  self::caller(({dynamic x = null}) → core::Null {
     core::print("<anon> was called with ${x}");
   });
   core::print(core::int.{core::Object::toString}());
@@ -86,8 +86,3 @@ static method main() → dynamic {
   }
   core::print(core::int::parse("42"));
 }
-
-constants  {
-  #C1 = null
-  #C2 = core::Object {}
-}

pkg/front_end/testcases/general/external.dart.legacy.expect

@@ -13,10 +13,6 @@ static method onData(dynamic x) → void {
 static method main() → dynamic {
   dynamic string = core::String::fromCharCode(65);
   dynamic port = iso::ReceivePort::•();
-  self::subscription = port.listen(#C1);
+  self::subscription = port.listen(self::onData);
   port.sendPort.send(string);
 }
-
-constants  {
-  #C1 = tearoff self::onData
-}

pkg/front_end/testcases/general/external.dart.legacy.transformed.expect

@@ -13,10 +13,6 @@ static method onData(dynamic x) → void {
 static method main() → dynamic {
   dynamic string = core::String::fromCharCode(65);
   dynamic port = iso::ReceivePort::•();
-  self::subscription = port.listen(#C1);
+  self::subscription = port.listen(self::onData);
   port.sendPort.send(string);
 }
-
-constants  {
-  #C1 = tearoff self::onData
-}

pkg/front_end/testcases/general/external.dart.strong.expect

@@ -13,10 +13,6 @@ static method onData(dynamic x) → void {
 static method main() → dynamic {
   core::String string = core::String::fromCharCode(65);
   iso::ReceivePort port = iso::ReceivePort::•();
-  self::subscription = port.{iso::ReceivePort::listen}(#C1);
+  self::subscription = port.{iso::ReceivePort::listen}(self::onData);
   port.{iso::ReceivePort::sendPort}.{iso::SendPort::send}(string);
 }
-
-constants  {
-  #C1 = tearoff self::onData
-}

pkg/front_end/testcases/general/external.dart.strong.transformed.expect

@@ -13,10 +13,6 @@ static method onData(dynamic x) → void {
 static method main() → dynamic {
   core::String string = core::String::fromCharCode(65);
   iso::ReceivePort port = iso::ReceivePort::•();
-  self::subscription = port.{iso::ReceivePort::listen}(#C1);
+  self::subscription = port.{iso::ReceivePort::listen}(self::onData);
   port.{iso::ReceivePort::sendPort}.{iso::SendPort::send}(string);
 }
-
-constants  {
-  #C1 = tearoff self::onData
-}

pkg/front_end/testcases/general/external_import.dart.legacy.expect

@@ -1,17 +1,8 @@
-@#C2
-@#C4
-@#C6
+@dart._internal::ExternalName::•("dart-ext:here")
+@dart._internal::ExternalName::•("dart-ext:foo/../there")
+@dart._internal::ExternalName::•("dart-ext:/usr/local/somewhere")
 library;
 import self as self;
 import "dart:_internal" as _in;
 
 static method main() → dynamic {}
-
-constants  {
-  #C1 = "dart-ext:here"
-  #C2 = _in::ExternalName {name:#C1}
-  #C3 = "dart-ext:foo/../there"
-  #C4 = _in::ExternalName {name:#C3}
-  #C5 = "dart-ext:/usr/local/somewhere"
-  #C6 = _in::ExternalName {name:#C5}
-}

pkg/front_end/testcases/general/external_import.dart.legacy.transformed.expect

@@ -1,17 +1,8 @@
-@#C2
-@#C4
-@#C6
+@dart._internal::ExternalName::•("dart-ext:here")
+@dart._internal::ExternalName::•("dart-ext:foo/../there")
+@dart._internal::ExternalName::•("dart-ext:/usr/local/somewhere")
 library;
 import self as self;
 import "dart:_internal" as _in;
 
 static method main() → dynamic {}
-
-constants  {
-  #C1 = "dart-ext:here"
-  #C2 = _in::ExternalName {name:#C1}
-  #C3 = "dart-ext:foo/../there"
-  #C4 = _in::ExternalName {name:#C3}
-  #C5 = "dart-ext:/usr/local/somewhere"
-  #C6 = _in::ExternalName {name:#C5}
-}

pkg/front_end/testcases/general/external_import.dart.strong.expect

@@ -1,17 +1,8 @@
-@#C2
-@#C4
-@#C6
+@dart._internal::ExternalName::•("dart-ext:here")
+@dart._internal::ExternalName::•("dart-ext:foo/../there")
+@dart._internal::ExternalName::•("dart-ext:/usr/local/somewhere")
 library;
 import self as self;
 import "dart:_internal" as _in;
 
 static method main() → dynamic {}
-
-constants  {
-  #C1 = "dart-ext:here"
-  #C2 = _in::ExternalName {name:#C1}
-  #C3 = "dart-ext:foo/../there"
-  #C4 = _in::ExternalName {name:#C3}
-  #C5 = "dart-ext:/usr/local/somewhere"
-  #C6 = _in::ExternalName {name:#C5}
-}

pkg/front_end/testcases/general/external_import.dart.strong.transformed.expect

@@ -1,17 +1,8 @@
-@#C2
-@#C4
-@#C6
+@dart._internal::ExternalName::•("dart-ext:here")
+@dart._internal::ExternalName::•("dart-ext:foo/../there")
+@dart._internal::ExternalName::•("dart-ext:/usr/local/somewhere")
 library;
 import self as self;
 import "dart:_internal" as _in;
 
 static method main() → dynamic {}
-
-constants  {
-  #C1 = "dart-ext:here"
-  #C2 = _in::ExternalName {name:#C1}
-  #C3 = "dart-ext:foo/../there"
-  #C4 = _in::ExternalName {name:#C3}
-  #C5 = "dart-ext:/usr/local/somewhere"
-  #C6 = _in::ExternalName {name:#C5}
-}

pkg/front_end/testcases/general/for_in_without_declaration.dart.legacy.expect

@@ -146,18 +146,12 @@ class C extends self::Super {
         core::print(y);
       }
     }
+    const core::int constant = 0;
     for (final dynamic #t18 in <dynamic>[]) {
-      throw new core::NoSuchMethodError::withInvocation(null, new core::_InvocationMirror::_withType(#C1, 34, #C2, core::List::unmodifiable<dynamic>(<dynamic>[#t18]), core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+      throw new core::NoSuchMethodError::withInvocation(null, new core::_InvocationMirror::_withType(#constant, 34, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>[#t18]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
     }
   }
 }
 static field core::bool topLevelField;
 static field dynamic untypedTopLevelField;
 static method main() → dynamic {}
-
-constants  {
-  #C1 = #constant
-  #C2 = <core::Type>[]
-  #C3 = <dynamic>[]
-  #C4 = core::_ImmutableMap<core::Symbol, dynamic> {_kvPairs:#C3}
-}

pkg/front_end/testcases/general/for_in_without_declaration.dart.legacy.transformed.expect

@@ -146,18 +146,12 @@ class C extends self::Super {
         core::print(y);
       }
     }
+    const core::int constant = 0;
     for (final dynamic #t18 in <dynamic>[]) {
-      throw new core::NoSuchMethodError::withInvocation(null, new core::_InvocationMirror::_withType(#C1, 34, #C2, core::List::unmodifiable<dynamic>(<dynamic>[#t18]), core::Map::unmodifiable<core::Symbol, dynamic>(#C4)));
+      throw new core::NoSuchMethodError::withInvocation(null, new core::_InvocationMirror::_withType(#constant, 34, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>[#t18]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
     }
   }
 }
 static field core::bool topLevelField;
 static field dynamic untypedTopLevelField;
 static method main() → dynamic {}
-
-constants  {
-  #C1 = #constant
-  #C2 = <core::Type>[]
-  #C3 = <dynamic>[]
-  #C4 = core::_ImmutableMap<core::Symbol, dynamic> {_kvPairs:#C3}
-}

pkg/front_end/testcases/general/for_in_without_declaration.dart.strong.expect

@@ -176,6 +176,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
         core::print(y);
       }
     }
+    const core::int constant = 0;
     for (final dynamic #t18 in <dynamic>[]) {
       invalid-expression "pkg/front_end/testcases/general/for_in_without_declaration.dart:46:10: Error: Setter not found: 'constant'.
     for (constant in []) {}

pkg/front_end/testcases/general/for_in_without_declaration.dart.strong.transformed.expect

@@ -176,6 +176,7 @@ Try correcting the name to the name of an existing setter, or defining a setter
         core::print(y);
       }
     }
+    const core::int constant = 0;
     for (final dynamic #t18 in <dynamic>[]) {
       invalid-expression "pkg/front_end/testcases/general/for_in_without_declaration.dart:46:10: Error: Setter not found: 'constant'.
     for (constant in []) {}

pkg/front_end/testcases/general/function_type_assignments.dart.legacy.expect

@@ -2,9 +2,9 @@ library;
 import self as self;
 import "dart:core" as core;
 
-static field core::String x = #C1;
-static field core::String y = #C2;
-static field core::String z = #C3;
+static field core::String x = self::identity;
+static field core::String y = self::identityObject;
+static field core::String z = self::identityList;
 static method identity<T extends core::Object = dynamic>(self::identity::T t) → self::identity::T
   return t;
 static method identityObject<T extends core::Object = dynamic>(self::identityObject::T t) → self::identityObject::T
@@ -12,9 +12,3 @@ static method identityObject<T extends core::Object = dynamic>(self::identityObj
 static method identityList<T extends core::List<self::identityList::T> = dynamic>(self::identityList::T t) → self::identityList::T
   return t;
 static method main() → dynamic {}
-
-constants  {
-  #C1 = tearoff self::identity
-  #C2 = tearoff self::identityObject
-  #C3 = tearoff self::identityList
-}

pkg/front_end/testcases/general/function_type_assignments.dart.legacy.transformed.expect

@@ -2,9 +2,9 @@ library;
 import self as self;
 import "dart:core" as core;
 
-static field core::String x = #C1;
-static field core::String y = #C2;
-static field core::String z = #C3;
+static field core::String x = self::identity;
+static field core::String y = self::identityObject;
+static field core::String z = self::identityList;
 static method identity<T extends core::Object = dynamic>(self::identity::T t) → self::identity::T
   return t;
 static method identityObject<T extends core::Object = dynamic>(self::identityObject::T t) → self::identityObject::T
@@ -12,9 +12,3 @@ static method identityObject<T extends core::Object = dynamic>(self::identityObj
 static method identityList<T extends core::List<self::identityList::T> = dynamic>(self::identityList::T t) → self::identityList::T
   return t;
 static method main() → dynamic {}
-
-constants  {
-  #C1 = tearoff self::identity
-  #C2 = tearoff self::identityObject
-  #C3 = tearoff self::identityList
-}

pkg/front_end/testcases/general/function_type_assignments.dart.strong.expect

@@ -25,17 +25,17 @@ import "dart:core" as core;
 static field core::String x = let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/general/function_type_assignments.dart:11:12: Error: A value of type 'T Function<T>(T)' can't be assigned to a variable of type 'String'.
 Try changing the type of the left hand side, or casting the right hand side to 'String'.
 String x = identity; // No bound
-           ^" in (#C1) as{TypeError} core::String;
+           ^" in self::identity as{TypeError} core::String;
 static field core::String y = let final<BottomType> #t2 = invalid-expression "pkg/front_end/testcases/general/function_type_assignments.dart:12:12: Error: A value of type 'T Function<T extends Object>(T)' can't be assigned to a variable of type 'String'.
  - 'Object' is from 'dart:core'.
 Try changing the type of the left hand side, or casting the right hand side to 'String'.
 String y = identityObject; // Object bound
-           ^" in (#C2) as{TypeError} core::String;
+           ^" in self::identityObject as{TypeError} core::String;
 static field core::String z = let final<BottomType> #t3 = invalid-expression "pkg/front_end/testcases/general/function_type_assignments.dart:13:12: Error: A value of type 'T Function<T extends List<T>>(T)' can't be assigned to a variable of type 'String'.
  - 'List' is from 'dart:core'.
 Try changing the type of the left hand side, or casting the right hand side to 'String'.
 String z = identityList; // List<T> bound
-           ^" in (#C3) as{TypeError} core::String;
+           ^" in self::identityList as{TypeError} core::String;
 static method identity<T extends core::Object = dynamic>(self::identity::T t) → self::identity::T
   return t;
 static method identityObject<T extends core::Object = core::Object>(self::identityObject::T t) → self::identityObject::T
@@ -43,9 +43,3 @@ static method identityObject<T extends core::Object = core::Object>(self::identi
 static method identityList<T extends core::List<self::identityList::T> = core::List<dynamic>>(self::identityList::T t) → self::identityList::T
   return t;
 static method main() → dynamic {}
-
-constants  {
-  #C1 = tearoff self::identity
-  #C2 = tearoff self::identityObject
-  #C3 = tearoff self::identityList
-}

pkg/front_end/testcases/general/function_type_assignments.dart.strong.transformed.expect

@@ -25,17 +25,17 @@ import "dart:core" as core;
 static field core::String x = let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/general/function_type_assignments.dart:11:12: Error: A value of type 'T Function<T>(T)' can't be assigned to a variable of type 'String'.
 Try changing the type of the left hand side, or casting the right hand side to 'String'.
 String x = identity; // No bound
-           ^" in (#C1) as{TypeError} core::String;
+           ^" in self::identity as{TypeError} core::String;
 static field core::String y = let final<BottomType> #t2 = invalid-expression "pkg/front_end/testcases/general/function_type_assignments.dart:12:12: Error: A value of type 'T Function<T extends Object>(T)' can't be assigned to a variable of type 'String'.
  - 'Object' is from 'dart:core'.
 Try changing the type of the left hand side, or casting the right hand side to 'String'.
 String y = identityObject; // Object bound
-           ^" in (#C2) as{TypeError} core::String;
+           ^" in self::identityObject as{TypeError} core::String;
 static field core::String z = let final<BottomType> #t3 = invalid-expression "pkg/front_end/testcases/general/function_type_assignments.dart:13:12: Error: A value of type 'T Function<T extends List<T>>(T)' can't be assigned to a variable of type 'String'.
  - 'List' is from 'dart:core'.
 Try changing the type of the left hand side, or casting the right hand side to 'String'.
 String z = identityList; // List<T> bound
-           ^" in (#C3) as{TypeError} core::String;
+           ^" in self::identityList as{TypeError} core::String;
 static method identity<T extends core::Object = dynamic>(self::identity::T t) → self::identity::T
   return t;
 static method identityObject<T extends core::Object = core::Object>(self::identityObject::T t) → self::identityObject::T
@@ -43,9 +43,3 @@ static method identityObject<T extends core::Object = core::Object>(self::identi
 static method identityList<T extends core::List<self::identityList::T> = core::List<dynamic>>(self::identityList::T t) → self::identityList::T
   return t;
 static method main() → dynamic {}
-
-constants  {
-  #C1 = tearoff self::identity
-  #C2 = tearoff self::identityObject
-  #C3 = tearoff self::identityList
-}

pkg/front_end/testcases/general/functions.dart.legacy.expect

@@ -7,11 +7,7 @@ static method main() → dynamic {
     f.call(a: "Hello, World");
     f.call();
   }
-  local.call(({dynamic a = #C1}) → dynamic {
+  local.call(({dynamic a = "Default greeting!"}) → dynamic {
     core::print(a);
   });
 }
-
-constants  {
-  #C1 = "Default greeting!"
-}

pkg/front_end/testcases/general/functions.dart.legacy.transformed.expect

@@ -7,11 +7,7 @@ static method main() → dynamic {
     f.call(a: "Hello, World");
     f.call();
   }
-  local.call(({dynamic a = #C1}) → dynamic {
+  local.call(({dynamic a = "Default greeting!"}) → dynamic {
     core::print(a);
   });
 }
-
-constants  {
-  #C1 = "Default greeting!"
-}

pkg/front_end/testcases/general/functions.dart.strong.expect

@@ -7,11 +7,7 @@ static method main() → dynamic {
     f.call(a: "Hello, World");
     f.call();
   }
-  local.call(({dynamic a = #C1}) → core::Null {
+  local.call(({dynamic a = "Default greeting!"}) → core::Null {
     core::print(a);
   });
 }
-
-constants  {
-  #C1 = "Default greeting!"
-}

pkg/front_end/testcases/general/functions.dart.strong.transformed.expect

@@ -7,11 +7,7 @@ static method main() → dynamic {
     f.call(a: "Hello, World");
     f.call();
   }
-  local.call(({dynamic a = #C1}) → core::Null {
+  local.call(({dynamic a = "Default greeting!"}) → core::Null {
     core::print(a);
   });
 }
-
-constants  {
-  #C1 = "Default greeting!"
-}

pkg/front_end/testcases/general/having_part_with_part_and_annotation.dart.legacy.expect

@@ -11,15 +11,10 @@ library;
 import self as self;
 import "dart:core" as core;
 
-@#C1
+@self::Foo
 part having_part_with_part_and_annotation_lib1.dart;
-static const field core::int Foo = #C1;
-static const field core::int Bar = #C2 /* from org-dartlang-testcase:///having_part_with_part_and_annotation_lib1.dart */;
+static const field core::int Foo = 42;
+static const field core::int Bar = 43 /* from org-dartlang-testcase:///having_part_with_part_and_annotation_lib1.dart */;
 static method fromMain() → void {}
 static method main() → dynamic {}
 static method /* from org-dartlang-testcase:///having_part_with_part_and_annotation_lib1.dart */ fromLib1() → void {}
-
-constants  {
-  #C1 = 42
-  #C2 = 43
-}

pkg/front_end/testcases/general/having_part_with_part_and_annotation.dart.legacy.transformed.expect

@@ -11,15 +11,10 @@ library;
 import self as self;
 import "dart:core" as core;
 
-@#C1
+@self::Foo
 part having_part_with_part_and_annotation_lib1.dart;
-static const field core::int Foo = #C1;
-static const field core::int Bar = #C2 /* from org-dartlang-testcase:///having_part_with_part_and_annotation_lib1.dart */;
+static const field core::int Foo = 42;
+static const field core::int Bar = 43 /* from org-dartlang-testcase:///having_part_with_part_and_annotation_lib1.dart */;
 static method fromMain() → void {}
 static method main() → dynamic {}
 static method /* from org-dartlang-testcase:///having_part_with_part_and_annotation_lib1.dart */ fromLib1() → void {}
-
-constants  {
-  #C1 = 42
-  #C2 = 43
-}

pkg/front_end/testcases/general/having_part_with_part_and_annotation.dart.strong.expect

@@ -11,15 +11,10 @@ library;
 import self as self;
 import "dart:core" as core;
 
-@#C1
+@self::Foo
 part having_part_with_part_and_annotation_lib1.dart;
-static const field core::int Foo = #C1;
-static const field core::int Bar = #C2 /* from org-dartlang-testcase:///having_part_with_part_and_annotation_lib1.dart */;
+static const field core::int Foo = 42;
+static const field core::int Bar = 43 /* from org-dartlang-testcase:///having_part_with_part_and_annotation_lib1.dart */;
 static method fromMain() → void {}
 static method main() → dynamic {}
 static method /* from org-dartlang-testcase:///having_part_with_part_and_annotation_lib1.dart */ fromLib1() → void {}
-
-constants  {
-  #C1 = 42
-  #C2 = 43
-}

pkg/front_end/testcases/general/having_part_with_part_and_annotation.dart.strong.transformed.expect

@@ -11,15 +11,10 @@ library;
 import self as self;
 import "dart:core" as core;
 
-@#C1
+@self::Foo
 part having_part_with_part_and_annotation_lib1.dart;
-static const field core::int Foo = #C1;
-static const field core::int Bar = #C2 /* from org-dartlang-testcase:///having_part_with_part_and_annotation_lib1.dart */;
+static const field core::int Foo = 42;
+static const field core::int Bar = 43 /* from org-dartlang-testcase:///having_part_with_part_and_annotation_lib1.dart */;
 static method fromMain() → void {}
 static method main() → dynamic {}
 static method /* from org-dartlang-testcase:///having_part_with_part_and_annotation_lib1.dart */ fromLib1() → void {}
-
-constants  {
-  #C1 = 42
-  #C2 = 43
-}