Version 2.18.0-280.0.dev Merge commit '29d7be011e5450fb01f4604affd93f2fb13bb8bf' into 'dev'

commit: d2df2ba0b8435275c42cd980e835c770ca962193 [log] [tgz]
author: Dart CI <dart-internal-sdk-dev-roller@dart-ci-internal.iam.gserviceaccount.com> Wed Jul 13 01:44:11 2022 -0700
committer: Dart CI <dart-internal-sdk-dev-roller@dart-ci-internal.iam.gserviceaccount.com> Wed Jul 13 01:44:11 2022 -0700
tree: d2c640c80fba93a171c5bc4eaf284a8e2bdccba4
parent: 270181685689456a5507281c3f35f51238653578 [diff]
parent: 29d7be011e5450fb01f4604affd93f2fb13bb8bf [diff]
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/remove_initializer.dart b/pkg/analysis_server/lib/src/services/correction/dart/remove_initializer.dart
index 764a2dd..0a44117 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/remove_initializer.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/remove_initializer.dart

@@ -11,10 +11,21 @@
 
 class RemoveInitializer extends CorrectionProducer {
   @override
-  bool get canBeAppliedInBulk => true;
+  bool canBeAppliedInBulk;
 
   @override
-  bool get canBeAppliedToFile => true;
+  bool canBeAppliedToFile;
+
+  /// Initialize a newly created instance that can't apply bulk and in-file
+  /// fixes.
+  RemoveInitializer()
+      : canBeAppliedInBulk = false,
+        canBeAppliedToFile = false;
+
+  /// Initialize a newly created instance that can apply bulk and in-file fixes.
+  RemoveInitializer.bulkFixable()
+      : canBeAppliedInBulk = true,
+        canBeAppliedToFile = true;
 
   @override
   FixKind get fixKind => DartFixKind.REMOVE_INITIALIZER;
@@ -46,6 +57,16 @@
             range.endEnd(variable.name, initializer),
           );
         });
+      } else {
+        var initializer =
+            node.thisOrAncestorOfType<ConstructorFieldInitializer>();
+        var parent = initializer?.parent;
+        if (parent is ConstructorDeclaration) {
+          await builder.addDartFileEdit(file, (builder) {
+            builder.addDeletion(
+                range.nodeInList(parent.initializers, initializer!));
+          });
+        }
       }
     }
   }

diff --git a/pkg/analysis_server/lib/src/services/correction/error_fix_status.yaml b/pkg/analysis_server/lib/src/services/correction/error_fix_status.yaml
index 3549471..df56220 100644
--- a/pkg/analysis_server/lib/src/services/correction/error_fix_status.yaml
+++ b/pkg/analysis_server/lib/src/services/correction/error_fix_status.yaml

@@ -89,10 +89,7 @@
 AnalysisOptionsWarningCode.UNSUPPORTED_VALUE:
   status: needsEvaluation
 CompileTimeErrorCode.ABSTRACT_FIELD_CONSTRUCTOR_INITIALIZER:
-  status: needsFix
-  notes: |-
-    1. Remove the initializer.
-    2. Remove the `abstract` keyword.
+  status: hasFix
 CompileTimeErrorCode.ABSTRACT_FIELD_INITIALIZER:
   status: needsFix
   notes: |-

diff --git a/pkg/analysis_server/lib/src/services/correction/fix_internal.dart b/pkg/analysis_server/lib/src/services/correction/fix_internal.dart
index 7e1be03..c17a5b2 100644
--- a/pkg/analysis_server/lib/src/services/correction/fix_internal.dart
+++ b/pkg/analysis_server/lib/src/services/correction/fix_internal.dart

@@ -385,7 +385,7 @@
       ConvertForEachToForLoop.new,
     ],
     LintNames.avoid_init_to_null: [
-      RemoveInitializer.new,
+      RemoveInitializer.bulkFixable,
     ],
     LintNames.avoid_null_checks_in_equality_operators: [
       RemoveComparison.new,
@@ -862,6 +862,9 @@
   /// those diagnostics. The generators used for lint rules are in the
   /// [lintProducerMap].
   static const Map<ErrorCode, List<ProducerGenerator>> nonLintProducerMap = {
+    CompileTimeErrorCode.ABSTRACT_FIELD_CONSTRUCTOR_INITIALIZER: [
+      RemoveInitializer.new,
+    ],
     CompileTimeErrorCode.ASSIGNMENT_TO_FINAL: [
       MakeFieldNotFinal.new,
       AddLate.new,

diff --git a/pkg/analysis_server/test/src/services/correction/fix/remove_initializer_test.dart b/pkg/analysis_server/test/src/services/correction/fix/remove_initializer_test.dart
index 1992d3f..e461671 100644
--- a/pkg/analysis_server/test/src/services/correction/fix/remove_initializer_test.dart
+++ b/pkg/analysis_server/test/src/services/correction/fix/remove_initializer_test.dart

@@ -51,6 +51,55 @@
   @override
   String get lintCode => LintNames.avoid_init_to_null;
 
+  Future<void> test_abstract_field_constructor_initializer() async {
+    await resolveTestCode('''
+abstract class A {
+  abstract int x;
+  A() : x = 0;
+}
+''');
+    await assertHasFix('''
+abstract class A {
+  abstract int x;
+  A();
+}
+''');
+  }
+
+  Future<void> test_abstract_field_constructor_initializer_first() async {
+    await resolveTestCode('''
+abstract class A {
+  abstract int x;
+  int y;
+  A() : x = 0, y = 1;
+}
+''');
+    await assertHasFix('''
+abstract class A {
+  abstract int x;
+  int y;
+  A() : y = 1;
+}
+''');
+  }
+
+  Future<void> test_abstract_field_constructor_initializer_last() async {
+    await resolveTestCode('''
+abstract class A {
+  int y;
+  abstract int x;
+  A() : y = 0, x = 1;
+}
+''');
+    await assertHasFix('''
+abstract class A {
+  int y;
+  abstract int x;
+  A() : y = 0;
+}
+''');
+  }
+
   Future<void> test_field() async {
     await resolveTestCode('''
 class Test {

diff --git a/pkg/analyzer/lib/src/dart/analysis/driver.dart b/pkg/analyzer/lib/src/dart/analysis/driver.dart
index 3058d67..79b5ba1 100644
--- a/pkg/analyzer/lib/src/dart/analysis/driver.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/driver.dart

@@ -85,7 +85,7 @@
 /// TODO(scheglov) Clean up the list of implicitly analyzed files.
 class AnalysisDriver implements AnalysisDriverGeneric {
   /// The version of data format, should be incremented on every format change.
-  static const int DATA_VERSION = 230;
+  static const int DATA_VERSION = 231;
 
   /// The number of exception contexts allowed to write. Once this field is
   /// zero, we stop writing any new exception contexts in this process.

diff --git a/pkg/analyzer_plugin/lib/utilities/range_factory.dart b/pkg/analyzer_plugin/lib/utilities/range_factory.dart
index cfbfea8..5eed266 100644
--- a/pkg/analyzer_plugin/lib/utilities/range_factory.dart
+++ b/pkg/analyzer_plugin/lib/utilities/range_factory.dart

@@ -135,6 +135,13 @@
       if (nextToken?.type == TokenType.COMMA) {
         return startEnd(item, nextToken!);
       }
+      var owner = list.owner;
+      if (owner is ConstructorDeclaration) {
+        var previousToSeparator = owner.separator?.previous;
+        if (previousToSeparator != null) {
+          return endStart(previousToSeparator, owner.body);
+        }
+      }
       return node(item);
     }
     final index = list.indexOf(item);

diff --git a/pkg/analyzer_plugin/test/utilities/range_factory_test.dart b/pkg/analyzer_plugin/test/utilities/range_factory_test.dart
index c6757b2c..1bc3b89 100644
--- a/pkg/analyzer_plugin/test/utilities/range_factory_test.dart
+++ b/pkg/analyzer_plugin/test/utilities/range_factory_test.dart

@@ -194,6 +194,14 @@
     return invocation.argumentList.arguments;
   }
 
+  /// Assuming that the test code starts with a class whose default constructor,
+  /// return the list of initializers in that constructor.
+  NodeList<ConstructorInitializer> get _constructorInitializers {
+    var c = testUnit.declarations[0] as ClassDeclaration;
+    var constructor = c.getConstructor(null) as ConstructorDeclaration;
+    return constructor.initializers;
+  }
+
   Future<void> test_argumentList_first_named() async {
     await resolveTestCode('''
 void f() {
@@ -303,6 +311,28 @@
     var list = _argumentList;
     expect(range.nodeInList(list, list[0]), SourceRange(15, 2));
   }
+
+  Future<void> test_constructorDeclaration_first() async {
+    await resolveTestCode('''
+class A {
+  int x;
+  A() : x = 0;
+}
+''');
+    var list = _constructorInitializers;
+    expect(range.nodeInList(list, list[0]), SourceRange(24, 8));
+  }
+
+  Future<void> test_constructorDeclaration_last() async {
+    await resolveTestCode('''
+class A {
+  int x, y;
+  A() : x = 0, y = 1;
+}
+''');
+    var list = _constructorInitializers;
+    expect(range.nodeInList(list, list[1]), SourceRange(35, 7));
+  }
 }
 
 @reflectiveTest

diff --git a/pkg/front_end/test/incremental_suite.dart b/pkg/front_end/test/incremental_suite.dart
index de4a3cf..126272d 100644
--- a/pkg/front_end/test/incremental_suite.dart
+++ b/pkg/front_end/test/incremental_suite.dart

@@ -99,6 +99,7 @@
 
 import "incremental_utils.dart" as util;
 
+import 'test_utils.dart';
 import 'testing_utils.dart' show checkEnvironment;
 
 import 'utils/io_utils.dart' show computeRepoDir;
@@ -1844,25 +1845,8 @@
   StringBuffer s = new StringBuffer();
   s.write(componentToString(c));
 
-  bool printedConstantCoverageHeader = false;
-  for (Source source in component.uriToSource.values) {
-    if (source.importUri?.scheme == "dart") continue;
-
-    if (source.constantCoverageConstructors != null &&
-        source.constantCoverageConstructors!.isNotEmpty) {
-      if (!printedConstantCoverageHeader) {
-        s.writeln("");
-        s.writeln("");
-        s.writeln("Constructor coverage from constants:");
-        printedConstantCoverageHeader = true;
-      }
-      s.writeln("${source.fileUri}:");
-      for (Reference reference in source.constantCoverageConstructors!) {
-        s.writeln("- ${reference.node} (from ${reference.node?.location})");
-      }
-      s.writeln("");
-    }
-  }
+  addConstantCoverageToExpectation(component, s,
+      skipImportUri: (Uri? importUri) => importUri?.scheme == "dart");
 
   if (dartUris.isNotEmpty) {
     s.writeln("");

diff --git a/pkg/front_end/test/test_utils.dart b/pkg/front_end/test/test_utils.dart
new file mode 100644
index 0000000..ade7b47
--- /dev/null
+++ b/pkg/front_end/test/test_utils.dart

@@ -0,0 +1,47 @@
+// Copyright (c) 2022, the Dart project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE.md file.
+
+import 'package:kernel/ast.dart';
+
+/// Writes constant coverage for [component] into [buffer}.
+///
+/// Libraries for whose import uri [skipImportUri] returns `true` are skipped.
+void addConstantCoverageToExpectation(Component component, StringBuffer buffer,
+    {required bool Function(Uri?) skipImportUri}) {
+  bool printedConstantCoverageHeader = false;
+  for (Source source in component.uriToSource.values) {
+    if (skipImportUri(source.importUri)) continue;
+
+    if (source.constantCoverageConstructors != null &&
+        source.constantCoverageConstructors!.isNotEmpty) {
+      if (!printedConstantCoverageHeader) {
+        buffer.writeln("");
+        buffer.writeln("");
+        buffer.writeln("Constructor coverage from constants:");
+        printedConstantCoverageHeader = true;
+      }
+      buffer.writeln("${source.fileUri}:");
+      for (Reference reference in source.constantCoverageConstructors!) {
+        buffer.writeln(
+            "- ${reference.node} (from ${locationToString(reference)})");
+      }
+      buffer.writeln("");
+    }
+  }
+}
+
+/// Computes a string representation of the location of the node from
+/// [reference].
+///
+/// References to sdk nodes only include the file uri to avoid unnecessary
+/// dependency on sdk library sources.
+String locationToString(Reference reference) {
+  Location? location = reference.node?.location;
+  if (location != null && location.file.isScheme('org-dartlang-sdk')) {
+    // Don't include line/column numbers for sdk libraries to avoid unnecessary
+    // dependency on sdk library sources.
+    return '${location.file}';
+  }
+  return '$location';
+}

diff --git a/pkg/front_end/test/utils/kernel_chain.dart b/pkg/front_end/test/utils/kernel_chain.dart
index 94f121e..eb3401f 100644
--- a/pkg/front_end/test/utils/kernel_chain.dart
+++ b/pkg/front_end/test/utils/kernel_chain.dart

@@ -35,7 +35,6 @@
         Component,
         Library,
         Procedure,
-        Reference,
         ReturnStatement,
         Source,
         Statement;
@@ -63,6 +62,7 @@
         TestDescription;
 
 import '../fasta/testing/suite.dart' show CompilationSetup;
+import '../test_utils.dart';
 
 final Uri platformBinariesLocation = computePlatformBinariesLocation();
 
@@ -312,26 +312,9 @@
         buffer.writeln(extraConstantString);
       }
     }
-    bool printedConstantCoverageHeader = false;
-    for (Source source in result.component.uriToSource.values) {
-      if (!result.isUserLibraryImportUri(source.importUri)) continue;
-
-      if (source.constantCoverageConstructors != null &&
-          source.constantCoverageConstructors!.isNotEmpty) {
-        if (!printedConstantCoverageHeader) {
-          buffer.writeln("");
-          buffer.writeln("");
-          buffer.writeln("Constructor coverage from constants:");
-          printedConstantCoverageHeader = true;
-        }
-        buffer.writeln("${source.fileUri}:");
-        for (Reference reference in source.constantCoverageConstructors!) {
-          buffer.writeln(
-              "- ${reference.node} (from ${reference.node?.location})");
-        }
-        buffer.writeln("");
-      }
-    }
+    addConstantCoverageToExpectation(result.component, buffer,
+        skipImportUri: (Uri? importUri) =>
+            !result.isUserLibraryImportUri(importUri));
 
     String actual = "$buffer";
     String binariesPath =

diff --git a/pkg/front_end/testcases/const_functions/const_functions_const_ctor.dart.strong.expect b/pkg/front_end/testcases/const_functions/const_functions_const_ctor.dart.strong.expect
index 819097c..e6bdc1b 100644
--- a/pkg/front_end/testcases/const_functions/const_functions_const_ctor.dart.strong.expect
+++ b/pkg/front_end/testcases/const_functions/const_functions_const_ctor.dart.strong.expect

@@ -38,5 +38,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_functions_const_ctor.dart:
 - Simple. (from org-dartlang-testcase:///const_functions_const_ctor.dart:14:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - A. (from org-dartlang-testcase:///const_functions_const_ctor.dart:21:9)

diff --git a/pkg/front_end/testcases/const_functions/const_functions_const_ctor.dart.strong.transformed.expect b/pkg/front_end/testcases/const_functions/const_functions_const_ctor.dart.strong.transformed.expect
index 819097c..e6bdc1b 100644
--- a/pkg/front_end/testcases/const_functions/const_functions_const_ctor.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/const_functions/const_functions_const_ctor.dart.strong.transformed.expect

@@ -38,5 +38,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_functions_const_ctor.dart:
 - Simple. (from org-dartlang-testcase:///const_functions_const_ctor.dart:14:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - A. (from org-dartlang-testcase:///const_functions_const_ctor.dart:21:9)

diff --git a/pkg/front_end/testcases/const_functions/const_functions_const_ctor.dart.weak.expect b/pkg/front_end/testcases/const_functions/const_functions_const_ctor.dart.weak.expect
index 819097c..e6bdc1b 100644
--- a/pkg/front_end/testcases/const_functions/const_functions_const_ctor.dart.weak.expect
+++ b/pkg/front_end/testcases/const_functions/const_functions_const_ctor.dart.weak.expect

@@ -38,5 +38,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_functions_const_ctor.dart:
 - Simple. (from org-dartlang-testcase:///const_functions_const_ctor.dart:14:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - A. (from org-dartlang-testcase:///const_functions_const_ctor.dart:21:9)

diff --git a/pkg/front_end/testcases/const_functions/const_functions_const_ctor.dart.weak.modular.expect b/pkg/front_end/testcases/const_functions/const_functions_const_ctor.dart.weak.modular.expect
index 819097c..e6bdc1b 100644
--- a/pkg/front_end/testcases/const_functions/const_functions_const_ctor.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/const_functions/const_functions_const_ctor.dart.weak.modular.expect

@@ -38,5 +38,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_functions_const_ctor.dart:
 - Simple. (from org-dartlang-testcase:///const_functions_const_ctor.dart:14:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - A. (from org-dartlang-testcase:///const_functions_const_ctor.dart:21:9)

diff --git a/pkg/front_end/testcases/const_functions/const_functions_const_ctor.dart.weak.transformed.expect b/pkg/front_end/testcases/const_functions/const_functions_const_ctor.dart.weak.transformed.expect
index 819097c..e6bdc1b 100644
--- a/pkg/front_end/testcases/const_functions/const_functions_const_ctor.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/const_functions/const_functions_const_ctor.dart.weak.transformed.expect

@@ -38,5 +38,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_functions_const_ctor.dart:
 - Simple. (from org-dartlang-testcase:///const_functions_const_ctor.dart:14:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - A. (from org-dartlang-testcase:///const_functions_const_ctor.dart:21:9)

diff --git a/pkg/front_end/testcases/const_functions/const_functions_const_ctor_error.dart.strong.expect b/pkg/front_end/testcases/const_functions/const_functions_const_ctor_error.dart.strong.expect
index b972e0f..693c3c9 100644
--- a/pkg/front_end/testcases/const_functions/const_functions_const_ctor_error.dart.strong.expect
+++ b/pkg/front_end/testcases/const_functions/const_functions_const_ctor_error.dart.strong.expect

@@ -92,7 +92,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_functions_const_ctor_error.dart:
 - Simple. (from org-dartlang-testcase:///const_functions_const_ctor_error.dart:16:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Simple2. (from org-dartlang-testcase:///const_functions_const_ctor_error.dart:25:9)
 - B. (from org-dartlang-testcase:///const_functions_const_ctor_error.dart:38:9)
 - A. (from org-dartlang-testcase:///const_functions_const_ctor_error.dart:32:9)

diff --git a/pkg/front_end/testcases/const_functions/const_functions_const_ctor_error.dart.strong.transformed.expect b/pkg/front_end/testcases/const_functions/const_functions_const_ctor_error.dart.strong.transformed.expect
index 1c93204..7e96ce4 100644
--- a/pkg/front_end/testcases/const_functions/const_functions_const_ctor_error.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/const_functions/const_functions_const_ctor_error.dart.strong.transformed.expect

@@ -96,7 +96,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_functions_const_ctor_error.dart:
 - Simple. (from org-dartlang-testcase:///const_functions_const_ctor_error.dart:16:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Simple2. (from org-dartlang-testcase:///const_functions_const_ctor_error.dart:25:9)
 - B. (from org-dartlang-testcase:///const_functions_const_ctor_error.dart:38:9)
 - A. (from org-dartlang-testcase:///const_functions_const_ctor_error.dart:32:9)

diff --git a/pkg/front_end/testcases/const_functions/const_functions_const_ctor_error.dart.weak.expect b/pkg/front_end/testcases/const_functions/const_functions_const_ctor_error.dart.weak.expect
index b972e0f..693c3c9 100644
--- a/pkg/front_end/testcases/const_functions/const_functions_const_ctor_error.dart.weak.expect
+++ b/pkg/front_end/testcases/const_functions/const_functions_const_ctor_error.dart.weak.expect

@@ -92,7 +92,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_functions_const_ctor_error.dart:
 - Simple. (from org-dartlang-testcase:///const_functions_const_ctor_error.dart:16:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Simple2. (from org-dartlang-testcase:///const_functions_const_ctor_error.dart:25:9)
 - B. (from org-dartlang-testcase:///const_functions_const_ctor_error.dart:38:9)
 - A. (from org-dartlang-testcase:///const_functions_const_ctor_error.dart:32:9)

diff --git a/pkg/front_end/testcases/const_functions/const_functions_const_ctor_error.dart.weak.modular.expect b/pkg/front_end/testcases/const_functions/const_functions_const_ctor_error.dart.weak.modular.expect
index b972e0f..693c3c9 100644
--- a/pkg/front_end/testcases/const_functions/const_functions_const_ctor_error.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/const_functions/const_functions_const_ctor_error.dart.weak.modular.expect

@@ -92,7 +92,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_functions_const_ctor_error.dart:
 - Simple. (from org-dartlang-testcase:///const_functions_const_ctor_error.dart:16:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Simple2. (from org-dartlang-testcase:///const_functions_const_ctor_error.dart:25:9)
 - B. (from org-dartlang-testcase:///const_functions_const_ctor_error.dart:38:9)
 - A. (from org-dartlang-testcase:///const_functions_const_ctor_error.dart:32:9)

diff --git a/pkg/front_end/testcases/const_functions/const_functions_const_ctor_error.dart.weak.transformed.expect b/pkg/front_end/testcases/const_functions/const_functions_const_ctor_error.dart.weak.transformed.expect
index 1c93204..7e96ce4 100644
--- a/pkg/front_end/testcases/const_functions/const_functions_const_ctor_error.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/const_functions/const_functions_const_ctor_error.dart.weak.transformed.expect

@@ -96,7 +96,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_functions_const_ctor_error.dart:
 - Simple. (from org-dartlang-testcase:///const_functions_const_ctor_error.dart:16:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Simple2. (from org-dartlang-testcase:///const_functions_const_ctor_error.dart:25:9)
 - B. (from org-dartlang-testcase:///const_functions_const_ctor_error.dart:38:9)
 - A. (from org-dartlang-testcase:///const_functions_const_ctor_error.dart:32:9)

diff --git a/pkg/front_end/testcases/const_functions/const_functions_const_factory.dart.strong.expect b/pkg/front_end/testcases/const_functions/const_functions_const_factory.dart.strong.expect
index b9d7932..f247bc7 100644
--- a/pkg/front_end/testcases/const_functions/const_functions_const_factory.dart.strong.expect
+++ b/pkg/front_end/testcases/const_functions/const_functions_const_factory.dart.strong.expect

@@ -35,4 +35,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_functions_const_factory.dart:
 - MessageType._ (from org-dartlang-testcase:///const_functions_const_factory.dart:25:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/const_functions/const_functions_const_factory.dart.strong.transformed.expect b/pkg/front_end/testcases/const_functions/const_functions_const_factory.dart.strong.transformed.expect
index b9d7932..f247bc7 100644
--- a/pkg/front_end/testcases/const_functions/const_functions_const_factory.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/const_functions/const_functions_const_factory.dart.strong.transformed.expect

@@ -35,4 +35,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_functions_const_factory.dart:
 - MessageType._ (from org-dartlang-testcase:///const_functions_const_factory.dart:25:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/const_functions/const_functions_const_factory.dart.weak.expect b/pkg/front_end/testcases/const_functions/const_functions_const_factory.dart.weak.expect
index b9d7932..f247bc7 100644
--- a/pkg/front_end/testcases/const_functions/const_functions_const_factory.dart.weak.expect
+++ b/pkg/front_end/testcases/const_functions/const_functions_const_factory.dart.weak.expect

@@ -35,4 +35,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_functions_const_factory.dart:
 - MessageType._ (from org-dartlang-testcase:///const_functions_const_factory.dart:25:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/const_functions/const_functions_const_factory.dart.weak.modular.expect b/pkg/front_end/testcases/const_functions/const_functions_const_factory.dart.weak.modular.expect
index b9d7932..f247bc7 100644
--- a/pkg/front_end/testcases/const_functions/const_functions_const_factory.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/const_functions/const_functions_const_factory.dart.weak.modular.expect

@@ -35,4 +35,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_functions_const_factory.dart:
 - MessageType._ (from org-dartlang-testcase:///const_functions_const_factory.dart:25:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/const_functions/const_functions_const_factory.dart.weak.transformed.expect b/pkg/front_end/testcases/const_functions/const_functions_const_factory.dart.weak.transformed.expect
index b9d7932..f247bc7 100644
--- a/pkg/front_end/testcases/const_functions/const_functions_const_factory.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/const_functions/const_functions_const_factory.dart.weak.transformed.expect

@@ -35,4 +35,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_functions_const_factory.dart:
 - MessageType._ (from org-dartlang-testcase:///const_functions_const_factory.dart:25:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/const_functions/const_functions_instance_fields.dart.strong.expect b/pkg/front_end/testcases/const_functions/const_functions_instance_fields.dart.strong.expect
index 889f2d5..e687675 100644
--- a/pkg/front_end/testcases/const_functions/const_functions_instance_fields.dart.strong.expect
+++ b/pkg/front_end/testcases/const_functions/const_functions_instance_fields.dart.strong.expect

@@ -60,6 +60,6 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_functions_instance_fields.dart:
 - A. (from org-dartlang-testcase:///const_functions_instance_fields.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - B. (from org-dartlang-testcase:///const_functions_instance_fields.dart:27:9)
 - C. (from org-dartlang-testcase:///const_functions_instance_fields.dart:37:9)

diff --git a/pkg/front_end/testcases/const_functions/const_functions_instance_fields.dart.strong.transformed.expect b/pkg/front_end/testcases/const_functions/const_functions_instance_fields.dart.strong.transformed.expect
index 889f2d5..e687675 100644
--- a/pkg/front_end/testcases/const_functions/const_functions_instance_fields.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/const_functions/const_functions_instance_fields.dart.strong.transformed.expect

@@ -60,6 +60,6 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_functions_instance_fields.dart:
 - A. (from org-dartlang-testcase:///const_functions_instance_fields.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - B. (from org-dartlang-testcase:///const_functions_instance_fields.dart:27:9)
 - C. (from org-dartlang-testcase:///const_functions_instance_fields.dart:37:9)

diff --git a/pkg/front_end/testcases/const_functions/const_functions_instance_fields.dart.weak.expect b/pkg/front_end/testcases/const_functions/const_functions_instance_fields.dart.weak.expect
index 889f2d5..e687675 100644
--- a/pkg/front_end/testcases/const_functions/const_functions_instance_fields.dart.weak.expect
+++ b/pkg/front_end/testcases/const_functions/const_functions_instance_fields.dart.weak.expect

@@ -60,6 +60,6 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_functions_instance_fields.dart:
 - A. (from org-dartlang-testcase:///const_functions_instance_fields.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - B. (from org-dartlang-testcase:///const_functions_instance_fields.dart:27:9)
 - C. (from org-dartlang-testcase:///const_functions_instance_fields.dart:37:9)

diff --git a/pkg/front_end/testcases/const_functions/const_functions_instance_fields.dart.weak.modular.expect b/pkg/front_end/testcases/const_functions/const_functions_instance_fields.dart.weak.modular.expect
index 889f2d5..e687675 100644
--- a/pkg/front_end/testcases/const_functions/const_functions_instance_fields.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/const_functions/const_functions_instance_fields.dart.weak.modular.expect

@@ -60,6 +60,6 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_functions_instance_fields.dart:
 - A. (from org-dartlang-testcase:///const_functions_instance_fields.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - B. (from org-dartlang-testcase:///const_functions_instance_fields.dart:27:9)
 - C. (from org-dartlang-testcase:///const_functions_instance_fields.dart:37:9)

diff --git a/pkg/front_end/testcases/const_functions/const_functions_instance_fields.dart.weak.transformed.expect b/pkg/front_end/testcases/const_functions/const_functions_instance_fields.dart.weak.transformed.expect
index 889f2d5..e687675 100644
--- a/pkg/front_end/testcases/const_functions/const_functions_instance_fields.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/const_functions/const_functions_instance_fields.dart.weak.transformed.expect

@@ -60,6 +60,6 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_functions_instance_fields.dart:
 - A. (from org-dartlang-testcase:///const_functions_instance_fields.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - B. (from org-dartlang-testcase:///const_functions_instance_fields.dart:27:9)
 - C. (from org-dartlang-testcase:///const_functions_instance_fields.dart:37:9)

diff --git a/pkg/front_end/testcases/const_functions/const_functions_instance_methods.dart.strong.expect b/pkg/front_end/testcases/const_functions/const_functions_instance_methods.dart.strong.expect
index 740f2d9..eb461b1 100644
--- a/pkg/front_end/testcases/const_functions/const_functions_instance_methods.dart.strong.expect
+++ b/pkg/front_end/testcases/const_functions/const_functions_instance_methods.dart.strong.expect

@@ -129,7 +129,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_functions_instance_methods.dart:
 - A. (from org-dartlang-testcase:///const_functions_instance_methods.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - B. (from org-dartlang-testcase:///const_functions_instance_methods.dart:14:9)
 - C. (from org-dartlang-testcase:///const_functions_instance_methods.dart:23:9)
 - D. (from org-dartlang-testcase:///const_functions_instance_methods.dart:32:9)

diff --git a/pkg/front_end/testcases/const_functions/const_functions_instance_methods.dart.strong.transformed.expect b/pkg/front_end/testcases/const_functions/const_functions_instance_methods.dart.strong.transformed.expect
index 740f2d9..eb461b1 100644
--- a/pkg/front_end/testcases/const_functions/const_functions_instance_methods.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/const_functions/const_functions_instance_methods.dart.strong.transformed.expect

@@ -129,7 +129,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_functions_instance_methods.dart:
 - A. (from org-dartlang-testcase:///const_functions_instance_methods.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - B. (from org-dartlang-testcase:///const_functions_instance_methods.dart:14:9)
 - C. (from org-dartlang-testcase:///const_functions_instance_methods.dart:23:9)
 - D. (from org-dartlang-testcase:///const_functions_instance_methods.dart:32:9)

diff --git a/pkg/front_end/testcases/const_functions/const_functions_instance_methods.dart.weak.expect b/pkg/front_end/testcases/const_functions/const_functions_instance_methods.dart.weak.expect
index d74febc..843dbe0 100644
--- a/pkg/front_end/testcases/const_functions/const_functions_instance_methods.dart.weak.expect
+++ b/pkg/front_end/testcases/const_functions/const_functions_instance_methods.dart.weak.expect

@@ -129,7 +129,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_functions_instance_methods.dart:
 - A. (from org-dartlang-testcase:///const_functions_instance_methods.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - B. (from org-dartlang-testcase:///const_functions_instance_methods.dart:14:9)
 - C. (from org-dartlang-testcase:///const_functions_instance_methods.dart:23:9)
 - D. (from org-dartlang-testcase:///const_functions_instance_methods.dart:32:9)

diff --git a/pkg/front_end/testcases/const_functions/const_functions_instance_methods.dart.weak.modular.expect b/pkg/front_end/testcases/const_functions/const_functions_instance_methods.dart.weak.modular.expect
index d74febc..843dbe0 100644
--- a/pkg/front_end/testcases/const_functions/const_functions_instance_methods.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/const_functions/const_functions_instance_methods.dart.weak.modular.expect

@@ -129,7 +129,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_functions_instance_methods.dart:
 - A. (from org-dartlang-testcase:///const_functions_instance_methods.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - B. (from org-dartlang-testcase:///const_functions_instance_methods.dart:14:9)
 - C. (from org-dartlang-testcase:///const_functions_instance_methods.dart:23:9)
 - D. (from org-dartlang-testcase:///const_functions_instance_methods.dart:32:9)

diff --git a/pkg/front_end/testcases/const_functions/const_functions_instance_methods.dart.weak.transformed.expect b/pkg/front_end/testcases/const_functions/const_functions_instance_methods.dart.weak.transformed.expect
index d74febc..843dbe0 100644
--- a/pkg/front_end/testcases/const_functions/const_functions_instance_methods.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/const_functions/const_functions_instance_methods.dart.weak.transformed.expect

@@ -129,7 +129,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_functions_instance_methods.dart:
 - A. (from org-dartlang-testcase:///const_functions_instance_methods.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - B. (from org-dartlang-testcase:///const_functions_instance_methods.dart:14:9)
 - C. (from org-dartlang-testcase:///const_functions_instance_methods.dart:23:9)
 - D. (from org-dartlang-testcase:///const_functions_instance_methods.dart:32:9)

diff --git a/pkg/front_end/testcases/constructor_tearoffs/issue47154a.dart.strong.expect b/pkg/front_end/testcases/constructor_tearoffs/issue47154a.dart.strong.expect
index 6057dae..0af28ed 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/issue47154a.dart.strong.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/issue47154a.dart.strong.expect

@@ -27,4 +27,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue47154a.dart:
 - A. (from org-dartlang-testcase:///issue47154a.dart:7:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/constructor_tearoffs/issue47154a.dart.strong.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/issue47154a.dart.strong.transformed.expect
index 6057dae..0af28ed 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/issue47154a.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/issue47154a.dart.strong.transformed.expect

@@ -27,4 +27,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue47154a.dart:
 - A. (from org-dartlang-testcase:///issue47154a.dart:7:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/constructor_tearoffs/issue47154a.dart.weak.expect b/pkg/front_end/testcases/constructor_tearoffs/issue47154a.dart.weak.expect
index 9af80b0..1556957 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/issue47154a.dart.weak.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/issue47154a.dart.weak.expect

@@ -27,4 +27,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue47154a.dart:
 - A. (from org-dartlang-testcase:///issue47154a.dart:7:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/constructor_tearoffs/issue47154a.dart.weak.modular.expect b/pkg/front_end/testcases/constructor_tearoffs/issue47154a.dart.weak.modular.expect
index 9af80b0..1556957 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/issue47154a.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/issue47154a.dart.weak.modular.expect

@@ -27,4 +27,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue47154a.dart:
 - A. (from org-dartlang-testcase:///issue47154a.dart:7:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/constructor_tearoffs/issue47154a.dart.weak.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/issue47154a.dart.weak.transformed.expect
index 9af80b0..1556957 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/issue47154a.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/issue47154a.dart.weak.transformed.expect

@@ -27,4 +27,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue47154a.dart:
 - A. (from org-dartlang-testcase:///issue47154a.dart:7:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/constructor_tearoffs/issue47154b.dart.strong.expect b/pkg/front_end/testcases/constructor_tearoffs/issue47154b.dart.strong.expect
index 03e2e51..73dc523 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/issue47154b.dart.strong.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/issue47154b.dart.strong.expect

@@ -28,4 +28,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue47154b.dart:
 - A. (from org-dartlang-testcase:///issue47154b.dart:7:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/constructor_tearoffs/issue47154b.dart.strong.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/issue47154b.dart.strong.transformed.expect
index 03e2e51..73dc523 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/issue47154b.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/issue47154b.dart.strong.transformed.expect

@@ -28,4 +28,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue47154b.dart:
 - A. (from org-dartlang-testcase:///issue47154b.dart:7:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/constructor_tearoffs/issue47154b.dart.weak.expect b/pkg/front_end/testcases/constructor_tearoffs/issue47154b.dart.weak.expect
index a593732..bf6377d 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/issue47154b.dart.weak.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/issue47154b.dart.weak.expect

@@ -28,4 +28,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue47154b.dart:
 - A. (from org-dartlang-testcase:///issue47154b.dart:7:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/constructor_tearoffs/issue47154b.dart.weak.modular.expect b/pkg/front_end/testcases/constructor_tearoffs/issue47154b.dart.weak.modular.expect
index a593732..bf6377d 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/issue47154b.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/issue47154b.dart.weak.modular.expect

@@ -28,4 +28,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue47154b.dart:
 - A. (from org-dartlang-testcase:///issue47154b.dart:7:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/constructor_tearoffs/issue47154b.dart.weak.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/issue47154b.dart.weak.transformed.expect
index a593732..bf6377d 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/issue47154b.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/issue47154b.dart.weak.transformed.expect

@@ -28,4 +28,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue47154b.dart:
 - A. (from org-dartlang-testcase:///issue47154b.dart:7:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/constructor_tearoffs/issue47154c.dart.strong.expect b/pkg/front_end/testcases/constructor_tearoffs/issue47154c.dart.strong.expect
index 0c4cff4..ed994e7 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/issue47154c.dart.strong.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/issue47154c.dart.strong.expect

@@ -41,6 +41,6 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue47154c.dart:
 - A. (from org-dartlang-testcase:///issue47154c.dart:8:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - B. (from org-dartlang-testcase:///issue47154c.dart:16:9)
 - C. (from org-dartlang-testcase:///issue47154c.dart:22:9)

diff --git a/pkg/front_end/testcases/constructor_tearoffs/issue47154c.dart.strong.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/issue47154c.dart.strong.transformed.expect
index 0c4cff4..ed994e7 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/issue47154c.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/issue47154c.dart.strong.transformed.expect

@@ -41,6 +41,6 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue47154c.dart:
 - A. (from org-dartlang-testcase:///issue47154c.dart:8:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - B. (from org-dartlang-testcase:///issue47154c.dart:16:9)
 - C. (from org-dartlang-testcase:///issue47154c.dart:22:9)

diff --git a/pkg/front_end/testcases/constructor_tearoffs/issue47154c.dart.weak.expect b/pkg/front_end/testcases/constructor_tearoffs/issue47154c.dart.weak.expect
index 691f3a6..d4645aa 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/issue47154c.dart.weak.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/issue47154c.dart.weak.expect

@@ -41,6 +41,6 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue47154c.dart:
 - A. (from org-dartlang-testcase:///issue47154c.dart:8:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - B. (from org-dartlang-testcase:///issue47154c.dart:16:9)
 - C. (from org-dartlang-testcase:///issue47154c.dart:22:9)

diff --git a/pkg/front_end/testcases/constructor_tearoffs/issue47154c.dart.weak.modular.expect b/pkg/front_end/testcases/constructor_tearoffs/issue47154c.dart.weak.modular.expect
index 691f3a6..d4645aa 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/issue47154c.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/issue47154c.dart.weak.modular.expect

@@ -41,6 +41,6 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue47154c.dart:
 - A. (from org-dartlang-testcase:///issue47154c.dart:8:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - B. (from org-dartlang-testcase:///issue47154c.dart:16:9)
 - C. (from org-dartlang-testcase:///issue47154c.dart:22:9)

diff --git a/pkg/front_end/testcases/constructor_tearoffs/issue47154c.dart.weak.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/issue47154c.dart.weak.transformed.expect
index 691f3a6..d4645aa 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/issue47154c.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/issue47154c.dart.weak.transformed.expect

@@ -41,6 +41,6 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue47154c.dart:
 - A. (from org-dartlang-testcase:///issue47154c.dart:8:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - B. (from org-dartlang-testcase:///issue47154c.dart:16:9)
 - C. (from org-dartlang-testcase:///issue47154c.dart:22:9)

diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/const_redirect.dart.strong.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/const_redirect.dart.strong.expect
index 0e8c87e..c53cdc5 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/const_redirect.dart.strong.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/const_redirect.dart.strong.expect

@@ -65,4 +65,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_redirect.dart:
 - _ConstImpl. (from org-dartlang-testcase:///const_redirect.dart:35:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/const_redirect.dart.strong.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/const_redirect.dart.strong.transformed.expect
index 0e8c87e..c53cdc5 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/const_redirect.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/const_redirect.dart.strong.transformed.expect

@@ -65,4 +65,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_redirect.dart:
 - _ConstImpl. (from org-dartlang-testcase:///const_redirect.dart:35:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/const_redirect.dart.weak.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/const_redirect.dart.weak.expect
index f957d96..75a9bf4 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/const_redirect.dart.weak.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/const_redirect.dart.weak.expect

@@ -65,4 +65,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_redirect.dart:
 - _ConstImpl. (from org-dartlang-testcase:///const_redirect.dart:35:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/const_redirect.dart.weak.modular.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/const_redirect.dart.weak.modular.expect
index f957d96..75a9bf4 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/const_redirect.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/const_redirect.dart.weak.modular.expect

@@ -65,4 +65,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_redirect.dart:
 - _ConstImpl. (from org-dartlang-testcase:///const_redirect.dart:35:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/const_redirect.dart.weak.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/const_redirect.dart.weak.transformed.expect
index f957d96..75a9bf4 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/const_redirect.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/const_redirect.dart.weak.transformed.expect

@@ -65,4 +65,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_redirect.dart:
 - _ConstImpl. (from org-dartlang-testcase:///const_redirect.dart:35:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/constructor_tearoffs/simple_proper_rename_identity.dart.strong.expect b/pkg/front_end/testcases/constructor_tearoffs/simple_proper_rename_identity.dart.strong.expect
index 2949323..5dba2d3 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/simple_proper_rename_identity.dart.strong.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/simple_proper_rename_identity.dart.strong.expect

@@ -74,4 +74,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///simple_proper_rename_identity.dart:
 - StaticIdentityTest. (from org-dartlang-testcase:///simple_proper_rename_identity.dart:26:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/constructor_tearoffs/simple_proper_rename_identity.dart.strong.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/simple_proper_rename_identity.dart.strong.transformed.expect
index 2949323..5dba2d3 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/simple_proper_rename_identity.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/simple_proper_rename_identity.dart.strong.transformed.expect

@@ -74,4 +74,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///simple_proper_rename_identity.dart:
 - StaticIdentityTest. (from org-dartlang-testcase:///simple_proper_rename_identity.dart:26:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/constructor_tearoffs/simple_proper_rename_identity.dart.weak.expect b/pkg/front_end/testcases/constructor_tearoffs/simple_proper_rename_identity.dart.weak.expect
index 2949323..5dba2d3 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/simple_proper_rename_identity.dart.weak.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/simple_proper_rename_identity.dart.weak.expect

@@ -74,4 +74,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///simple_proper_rename_identity.dart:
 - StaticIdentityTest. (from org-dartlang-testcase:///simple_proper_rename_identity.dart:26:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/constructor_tearoffs/simple_proper_rename_identity.dart.weak.modular.expect b/pkg/front_end/testcases/constructor_tearoffs/simple_proper_rename_identity.dart.weak.modular.expect
index 2949323..5dba2d3 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/simple_proper_rename_identity.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/simple_proper_rename_identity.dart.weak.modular.expect

@@ -74,4 +74,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///simple_proper_rename_identity.dart:
 - StaticIdentityTest. (from org-dartlang-testcase:///simple_proper_rename_identity.dart:26:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/constructor_tearoffs/simple_proper_rename_identity.dart.weak.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/simple_proper_rename_identity.dart.weak.transformed.expect
index 2949323..5dba2d3 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/simple_proper_rename_identity.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/simple_proper_rename_identity.dart.weak.transformed.expect

@@ -74,4 +74,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///simple_proper_rename_identity.dart:
 - StaticIdentityTest. (from org-dartlang-testcase:///simple_proper_rename_identity.dart:26:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/constructor_tearoffs/unnamed_constructor.dart.strong.expect b/pkg/front_end/testcases/constructor_tearoffs/unnamed_constructor.dart.strong.expect
index 34009a6..271d3cf 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/unnamed_constructor.dart.strong.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/unnamed_constructor.dart.strong.expect

@@ -69,4 +69,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///unnamed_constructor.dart:
 - C. (from org-dartlang-testcase:///unnamed_constructor.dart:16:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/constructor_tearoffs/unnamed_constructor.dart.strong.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/unnamed_constructor.dart.strong.transformed.expect
index 34009a6..271d3cf 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/unnamed_constructor.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/unnamed_constructor.dart.strong.transformed.expect

@@ -69,4 +69,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///unnamed_constructor.dart:
 - C. (from org-dartlang-testcase:///unnamed_constructor.dart:16:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/constructor_tearoffs/unnamed_constructor.dart.weak.expect b/pkg/front_end/testcases/constructor_tearoffs/unnamed_constructor.dart.weak.expect
index 34009a6..271d3cf 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/unnamed_constructor.dart.weak.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/unnamed_constructor.dart.weak.expect

@@ -69,4 +69,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///unnamed_constructor.dart:
 - C. (from org-dartlang-testcase:///unnamed_constructor.dart:16:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/constructor_tearoffs/unnamed_constructor.dart.weak.modular.expect b/pkg/front_end/testcases/constructor_tearoffs/unnamed_constructor.dart.weak.modular.expect
index 34009a6..271d3cf 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/unnamed_constructor.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/unnamed_constructor.dart.weak.modular.expect

@@ -69,4 +69,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///unnamed_constructor.dart:
 - C. (from org-dartlang-testcase:///unnamed_constructor.dart:16:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/constructor_tearoffs/unnamed_constructor.dart.weak.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/unnamed_constructor.dart.weak.transformed.expect
index 34009a6..271d3cf 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/unnamed_constructor.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/unnamed_constructor.dart.weak.transformed.expect

@@ -69,4 +69,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///unnamed_constructor.dart:
 - C. (from org-dartlang-testcase:///unnamed_constructor.dart:16:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/dart2js/late_fields_with_annotation.dart.strong.expect b/pkg/front_end/testcases/dart2js/late_fields_with_annotation.dart.strong.expect
index da24f72..31a334c 100644
--- a/pkg/front_end/testcases/dart2js/late_fields_with_annotation.dart.strong.expect
+++ b/pkg/front_end/testcases/dart2js/late_fields_with_annotation.dart.strong.expect

@@ -60,5 +60,5 @@
 
 Constructor coverage from constants:
 org-dartlang-testcase:///late_fields_with_annotation.dart:
-- pragma._ (from org-dartlang-sdk:///lib/core/annotations.dart:188:9)
-- Object. (from org-dartlang-sdk:///lib/core/object.dart:25:9)
+- pragma._ (from org-dartlang-sdk:///lib/core/annotations.dart)
+- Object. (from org-dartlang-sdk:///lib/core/object.dart)

diff --git a/pkg/front_end/testcases/dart2js/late_fields_with_annotation.dart.strong.transformed.expect b/pkg/front_end/testcases/dart2js/late_fields_with_annotation.dart.strong.transformed.expect
index 25f45c8..76c8ca8 100644
--- a/pkg/front_end/testcases/dart2js/late_fields_with_annotation.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/dart2js/late_fields_with_annotation.dart.strong.transformed.expect

@@ -98,5 +98,5 @@
 
 Constructor coverage from constants:
 org-dartlang-testcase:///late_fields_with_annotation.dart:
-- pragma._ (from org-dartlang-sdk:///lib/core/annotations.dart:188:9)
-- Object. (from org-dartlang-sdk:///lib/core/object.dart:25:9)
+- pragma._ (from org-dartlang-sdk:///lib/core/annotations.dart)
+- Object. (from org-dartlang-sdk:///lib/core/object.dart)

diff --git a/pkg/front_end/testcases/dart2js/late_fields_with_annotation.dart.weak.expect b/pkg/front_end/testcases/dart2js/late_fields_with_annotation.dart.weak.expect
index da24f72..31a334c 100644
--- a/pkg/front_end/testcases/dart2js/late_fields_with_annotation.dart.weak.expect
+++ b/pkg/front_end/testcases/dart2js/late_fields_with_annotation.dart.weak.expect

@@ -60,5 +60,5 @@
 
 Constructor coverage from constants:
 org-dartlang-testcase:///late_fields_with_annotation.dart:
-- pragma._ (from org-dartlang-sdk:///lib/core/annotations.dart:188:9)
-- Object. (from org-dartlang-sdk:///lib/core/object.dart:25:9)
+- pragma._ (from org-dartlang-sdk:///lib/core/annotations.dart)
+- Object. (from org-dartlang-sdk:///lib/core/object.dart)

diff --git a/pkg/front_end/testcases/dart2js/late_fields_with_annotation.dart.weak.modular.expect b/pkg/front_end/testcases/dart2js/late_fields_with_annotation.dart.weak.modular.expect
index da24f72..31a334c 100644
--- a/pkg/front_end/testcases/dart2js/late_fields_with_annotation.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/dart2js/late_fields_with_annotation.dart.weak.modular.expect

@@ -60,5 +60,5 @@
 
 Constructor coverage from constants:
 org-dartlang-testcase:///late_fields_with_annotation.dart:
-- pragma._ (from org-dartlang-sdk:///lib/core/annotations.dart:188:9)
-- Object. (from org-dartlang-sdk:///lib/core/object.dart:25:9)
+- pragma._ (from org-dartlang-sdk:///lib/core/annotations.dart)
+- Object. (from org-dartlang-sdk:///lib/core/object.dart)

diff --git a/pkg/front_end/testcases/dart2js/late_fields_with_annotation.dart.weak.transformed.expect b/pkg/front_end/testcases/dart2js/late_fields_with_annotation.dart.weak.transformed.expect
index 25f45c8..76c8ca8 100644
--- a/pkg/front_end/testcases/dart2js/late_fields_with_annotation.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/dart2js/late_fields_with_annotation.dart.weak.transformed.expect

@@ -98,5 +98,5 @@
 
 Constructor coverage from constants:
 org-dartlang-testcase:///late_fields_with_annotation.dart:
-- pragma._ (from org-dartlang-sdk:///lib/core/annotations.dart:188:9)
-- Object. (from org-dartlang-sdk:///lib/core/object.dart:25:9)
+- pragma._ (from org-dartlang-sdk:///lib/core/annotations.dart)
+- Object. (from org-dartlang-sdk:///lib/core/object.dart)

diff --git a/pkg/front_end/testcases/dartdevc/static_interop_erasure/main.dart.strong.expect b/pkg/front_end/testcases/dartdevc/static_interop_erasure/main.dart.strong.expect
index 39fa210..ce2f821 100644
--- a/pkg/front_end/testcases/dartdevc/static_interop_erasure/main.dart.strong.expect
+++ b/pkg/front_end/testcases/dartdevc/static_interop_erasure/main.dart.strong.expect

@@ -53,4 +53,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///main_lib.dart:
 - JS. (from org-dartlang-testcase-sdk:///pkg/js/lib/js.dart:23:9)
-- Object. (from org-dartlang-sdk:///lib/core/object.dart:-1:-1)
+- Object. (from org-dartlang-sdk:///lib/core/object.dart)

diff --git a/pkg/front_end/testcases/dartdevc/static_interop_erasure/main.dart.strong.transformed.expect b/pkg/front_end/testcases/dartdevc/static_interop_erasure/main.dart.strong.transformed.expect
index 6bdb36d..03e64fd 100644
--- a/pkg/front_end/testcases/dartdevc/static_interop_erasure/main.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/dartdevc/static_interop_erasure/main.dart.strong.transformed.expect

@@ -54,4 +54,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///main_lib.dart:
 - JS. (from org-dartlang-testcase-sdk:///pkg/js/lib/js.dart:23:9)
-- Object. (from org-dartlang-sdk:///lib/core/object.dart:-1:-1)
+- Object. (from org-dartlang-sdk:///lib/core/object.dart)

diff --git a/pkg/front_end/testcases/dartdevc/static_interop_erasure/main.dart.weak.expect b/pkg/front_end/testcases/dartdevc/static_interop_erasure/main.dart.weak.expect
index 39fa210..ce2f821 100644
--- a/pkg/front_end/testcases/dartdevc/static_interop_erasure/main.dart.weak.expect
+++ b/pkg/front_end/testcases/dartdevc/static_interop_erasure/main.dart.weak.expect

@@ -53,4 +53,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///main_lib.dart:
 - JS. (from org-dartlang-testcase-sdk:///pkg/js/lib/js.dart:23:9)
-- Object. (from org-dartlang-sdk:///lib/core/object.dart:-1:-1)
+- Object. (from org-dartlang-sdk:///lib/core/object.dart)

diff --git a/pkg/front_end/testcases/dartdevc/static_interop_erasure/main.dart.weak.outline.expect b/pkg/front_end/testcases/dartdevc/static_interop_erasure/main.dart.weak.outline.expect
index 4deaf52..6c57913 100644
--- a/pkg/front_end/testcases/dartdevc/static_interop_erasure/main.dart.weak.outline.expect
+++ b/pkg/front_end/testcases/dartdevc/static_interop_erasure/main.dart.weak.outline.expect

@@ -46,4 +46,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///main_lib.dart:
 - JS. (from org-dartlang-testcase-sdk:///pkg/js/lib/js.dart:23:9)
-- Object. (from org-dartlang-sdk:///lib/core/object.dart:-1:-1)
+- Object. (from org-dartlang-sdk:///lib/core/object.dart)

diff --git a/pkg/front_end/testcases/dartdevc/static_interop_erasure/main.dart.weak.transformed.expect b/pkg/front_end/testcases/dartdevc/static_interop_erasure/main.dart.weak.transformed.expect
index 6bdb36d..03e64fd 100644
--- a/pkg/front_end/testcases/dartdevc/static_interop_erasure/main.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/dartdevc/static_interop_erasure/main.dart.weak.transformed.expect

@@ -54,4 +54,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///main_lib.dart:
 - JS. (from org-dartlang-testcase-sdk:///pkg/js/lib/js.dart:23:9)
-- Object. (from org-dartlang-sdk:///lib/core/object.dart:-1:-1)
+- Object. (from org-dartlang-sdk:///lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/abstract_members.dart.strong.expect b/pkg/front_end/testcases/enhanced_enums/abstract_members.dart.strong.expect
index 51394bf..a47be61 100644
--- a/pkg/front_end/testcases/enhanced_enums/abstract_members.dart.strong.expect
+++ b/pkg/front_end/testcases/enhanced_enums/abstract_members.dart.strong.expect

@@ -179,8 +179,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///abstract_members.dart:
 - E1. (from org-dartlang-testcase:///abstract_members.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///abstract_members.dart:11:6)
 - E3. (from org-dartlang-testcase:///abstract_members.dart:17:6)
 - E4. (from org-dartlang-testcase:///abstract_members.dart:27:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/abstract_members.dart.strong.transformed.expect b/pkg/front_end/testcases/enhanced_enums/abstract_members.dart.strong.transformed.expect
index bdb1b7c..fdcfbe2 100644
--- a/pkg/front_end/testcases/enhanced_enums/abstract_members.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/abstract_members.dart.strong.transformed.expect

@@ -178,8 +178,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///abstract_members.dart:
 - E1. (from org-dartlang-testcase:///abstract_members.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///abstract_members.dart:11:6)
 - E3. (from org-dartlang-testcase:///abstract_members.dart:17:6)
 - E4. (from org-dartlang-testcase:///abstract_members.dart:27:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/abstract_members.dart.weak.expect b/pkg/front_end/testcases/enhanced_enums/abstract_members.dart.weak.expect
index f5c53a3..2fc55aa 100644
--- a/pkg/front_end/testcases/enhanced_enums/abstract_members.dart.weak.expect
+++ b/pkg/front_end/testcases/enhanced_enums/abstract_members.dart.weak.expect

@@ -179,8 +179,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///abstract_members.dart:
 - E1. (from org-dartlang-testcase:///abstract_members.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///abstract_members.dart:11:6)
 - E3. (from org-dartlang-testcase:///abstract_members.dart:17:6)
 - E4. (from org-dartlang-testcase:///abstract_members.dart:27:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/abstract_members.dart.weak.modular.expect b/pkg/front_end/testcases/enhanced_enums/abstract_members.dart.weak.modular.expect
index f5c53a3..2fc55aa 100644
--- a/pkg/front_end/testcases/enhanced_enums/abstract_members.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/enhanced_enums/abstract_members.dart.weak.modular.expect

@@ -179,8 +179,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///abstract_members.dart:
 - E1. (from org-dartlang-testcase:///abstract_members.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///abstract_members.dart:11:6)
 - E3. (from org-dartlang-testcase:///abstract_members.dart:17:6)
 - E4. (from org-dartlang-testcase:///abstract_members.dart:27:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/abstract_members.dart.weak.transformed.expect b/pkg/front_end/testcases/enhanced_enums/abstract_members.dart.weak.transformed.expect
index e2f05ca..adfdc07 100644
--- a/pkg/front_end/testcases/enhanced_enums/abstract_members.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/abstract_members.dart.weak.transformed.expect

@@ -178,8 +178,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///abstract_members.dart:
 - E1. (from org-dartlang-testcase:///abstract_members.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///abstract_members.dart:11:6)
 - E3. (from org-dartlang-testcase:///abstract_members.dart:17:6)
 - E4. (from org-dartlang-testcase:///abstract_members.dart:27:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/conflicting_elements.dart.strong.expect b/pkg/front_end/testcases/enhanced_enums/conflicting_elements.dart.strong.expect
index ff4003b..bcd1c7d 100644
--- a/pkg/front_end/testcases/enhanced_enums/conflicting_elements.dart.strong.expect
+++ b/pkg/front_end/testcases/enhanced_enums/conflicting_elements.dart.strong.expect

@@ -230,8 +230,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///conflicting_elements.dart:
 - E2. (from org-dartlang-testcase:///conflicting_elements.dart:10:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E6. (from org-dartlang-testcase:///conflicting_elements.dart:33:6)
 - E7. (from org-dartlang-testcase:///conflicting_elements.dart:39:6)
 - E8. (from org-dartlang-testcase:///conflicting_elements.dart:49:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/conflicting_elements.dart.strong.transformed.expect b/pkg/front_end/testcases/enhanced_enums/conflicting_elements.dart.strong.transformed.expect
index b951615..89665eb 100644
--- a/pkg/front_end/testcases/enhanced_enums/conflicting_elements.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/conflicting_elements.dart.strong.transformed.expect

@@ -225,8 +225,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///conflicting_elements.dart:
 - E2. (from org-dartlang-testcase:///conflicting_elements.dart:10:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E6. (from org-dartlang-testcase:///conflicting_elements.dart:33:6)
 - E7. (from org-dartlang-testcase:///conflicting_elements.dart:39:6)
 - E8. (from org-dartlang-testcase:///conflicting_elements.dart:49:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/conflicting_elements.dart.weak.expect b/pkg/front_end/testcases/enhanced_enums/conflicting_elements.dart.weak.expect
index c9fbc33..b5487d8 100644
--- a/pkg/front_end/testcases/enhanced_enums/conflicting_elements.dart.weak.expect
+++ b/pkg/front_end/testcases/enhanced_enums/conflicting_elements.dart.weak.expect

@@ -230,8 +230,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///conflicting_elements.dart:
 - E2. (from org-dartlang-testcase:///conflicting_elements.dart:10:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E6. (from org-dartlang-testcase:///conflicting_elements.dart:33:6)
 - E7. (from org-dartlang-testcase:///conflicting_elements.dart:39:6)
 - E8. (from org-dartlang-testcase:///conflicting_elements.dart:49:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/conflicting_elements.dart.weak.modular.expect b/pkg/front_end/testcases/enhanced_enums/conflicting_elements.dart.weak.modular.expect
index c9fbc33..b5487d8 100644
--- a/pkg/front_end/testcases/enhanced_enums/conflicting_elements.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/enhanced_enums/conflicting_elements.dart.weak.modular.expect

@@ -230,8 +230,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///conflicting_elements.dart:
 - E2. (from org-dartlang-testcase:///conflicting_elements.dart:10:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E6. (from org-dartlang-testcase:///conflicting_elements.dart:33:6)
 - E7. (from org-dartlang-testcase:///conflicting_elements.dart:39:6)
 - E8. (from org-dartlang-testcase:///conflicting_elements.dart:49:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/conflicting_elements.dart.weak.transformed.expect b/pkg/front_end/testcases/enhanced_enums/conflicting_elements.dart.weak.transformed.expect
index 5d6b8c3..c96019f 100644
--- a/pkg/front_end/testcases/enhanced_enums/conflicting_elements.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/conflicting_elements.dart.weak.transformed.expect

@@ -225,8 +225,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///conflicting_elements.dart:
 - E2. (from org-dartlang-testcase:///conflicting_elements.dart:10:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E6. (from org-dartlang-testcase:///conflicting_elements.dart:33:6)
 - E7. (from org-dartlang-testcase:///conflicting_elements.dart:39:6)
 - E8. (from org-dartlang-testcase:///conflicting_elements.dart:49:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/constructor_calls.dart.strong.expect b/pkg/front_end/testcases/enhanced_enums/constructor_calls.dart.strong.expect
index 5e61e3a..8194366 100644
--- a/pkg/front_end/testcases/enhanced_enums/constructor_calls.dart.strong.expect
+++ b/pkg/front_end/testcases/enhanced_enums/constructor_calls.dart.strong.expect

@@ -152,6 +152,6 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///constructor_calls.dart:
 - E. (from org-dartlang-testcase:///constructor_calls.dart:11:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E.named (from org-dartlang-testcase:///constructor_calls.dart:13:9)

diff --git a/pkg/front_end/testcases/enhanced_enums/constructor_calls.dart.strong.transformed.expect b/pkg/front_end/testcases/enhanced_enums/constructor_calls.dart.strong.transformed.expect
index 5e61e3a..8194366 100644
--- a/pkg/front_end/testcases/enhanced_enums/constructor_calls.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/constructor_calls.dart.strong.transformed.expect

@@ -152,6 +152,6 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///constructor_calls.dart:
 - E. (from org-dartlang-testcase:///constructor_calls.dart:11:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E.named (from org-dartlang-testcase:///constructor_calls.dart:13:9)

diff --git a/pkg/front_end/testcases/enhanced_enums/constructor_calls.dart.weak.expect b/pkg/front_end/testcases/enhanced_enums/constructor_calls.dart.weak.expect
index 5e61e3a..8194366 100644
--- a/pkg/front_end/testcases/enhanced_enums/constructor_calls.dart.weak.expect
+++ b/pkg/front_end/testcases/enhanced_enums/constructor_calls.dart.weak.expect

@@ -152,6 +152,6 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///constructor_calls.dart:
 - E. (from org-dartlang-testcase:///constructor_calls.dart:11:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E.named (from org-dartlang-testcase:///constructor_calls.dart:13:9)

diff --git a/pkg/front_end/testcases/enhanced_enums/constructor_calls.dart.weak.modular.expect b/pkg/front_end/testcases/enhanced_enums/constructor_calls.dart.weak.modular.expect
index 5e61e3a..8194366 100644
--- a/pkg/front_end/testcases/enhanced_enums/constructor_calls.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/enhanced_enums/constructor_calls.dart.weak.modular.expect

@@ -152,6 +152,6 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///constructor_calls.dart:
 - E. (from org-dartlang-testcase:///constructor_calls.dart:11:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E.named (from org-dartlang-testcase:///constructor_calls.dart:13:9)

diff --git a/pkg/front_end/testcases/enhanced_enums/constructor_calls.dart.weak.transformed.expect b/pkg/front_end/testcases/enhanced_enums/constructor_calls.dart.weak.transformed.expect
index 5e61e3a..8194366 100644
--- a/pkg/front_end/testcases/enhanced_enums/constructor_calls.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/constructor_calls.dart.weak.transformed.expect

@@ -152,6 +152,6 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///constructor_calls.dart:
 - E. (from org-dartlang-testcase:///constructor_calls.dart:11:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E.named (from org-dartlang-testcase:///constructor_calls.dart:13:9)

diff --git a/pkg/front_end/testcases/enhanced_enums/declared_equals.dart.strong.expect b/pkg/front_end/testcases/enhanced_enums/declared_equals.dart.strong.expect
index aa36fa3..cd248aa 100644
--- a/pkg/front_end/testcases/enhanced_enums/declared_equals.dart.strong.expect
+++ b/pkg/front_end/testcases/enhanced_enums/declared_equals.dart.strong.expect

@@ -62,7 +62,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///declared_equals.dart:
 - E1. (from org-dartlang-testcase:///declared_equals.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///declared_equals.dart:11:6)
 - E3. (from org-dartlang-testcase:///declared_equals.dart:21:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/declared_equals.dart.strong.transformed.expect b/pkg/front_end/testcases/enhanced_enums/declared_equals.dart.strong.transformed.expect
index aa36fa3..cd248aa 100644
--- a/pkg/front_end/testcases/enhanced_enums/declared_equals.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/declared_equals.dart.strong.transformed.expect

@@ -62,7 +62,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///declared_equals.dart:
 - E1. (from org-dartlang-testcase:///declared_equals.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///declared_equals.dart:11:6)
 - E3. (from org-dartlang-testcase:///declared_equals.dart:21:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/declared_equals.dart.weak.expect b/pkg/front_end/testcases/enhanced_enums/declared_equals.dart.weak.expect
index b2e1541..a437ebe 100644
--- a/pkg/front_end/testcases/enhanced_enums/declared_equals.dart.weak.expect
+++ b/pkg/front_end/testcases/enhanced_enums/declared_equals.dart.weak.expect

@@ -62,7 +62,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///declared_equals.dart:
 - E1. (from org-dartlang-testcase:///declared_equals.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///declared_equals.dart:11:6)
 - E3. (from org-dartlang-testcase:///declared_equals.dart:21:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/declared_equals.dart.weak.modular.expect b/pkg/front_end/testcases/enhanced_enums/declared_equals.dart.weak.modular.expect
index b2e1541..a437ebe 100644
--- a/pkg/front_end/testcases/enhanced_enums/declared_equals.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/enhanced_enums/declared_equals.dart.weak.modular.expect

@@ -62,7 +62,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///declared_equals.dart:
 - E1. (from org-dartlang-testcase:///declared_equals.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///declared_equals.dart:11:6)
 - E3. (from org-dartlang-testcase:///declared_equals.dart:21:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/declared_equals.dart.weak.transformed.expect b/pkg/front_end/testcases/enhanced_enums/declared_equals.dart.weak.transformed.expect
index b2e1541..a437ebe 100644
--- a/pkg/front_end/testcases/enhanced_enums/declared_equals.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/declared_equals.dart.weak.transformed.expect

@@ -62,7 +62,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///declared_equals.dart:
 - E1. (from org-dartlang-testcase:///declared_equals.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///declared_equals.dart:11:6)
 - E3. (from org-dartlang-testcase:///declared_equals.dart:21:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/declared_hashcode.dart.strong.expect b/pkg/front_end/testcases/enhanced_enums/declared_hashcode.dart.strong.expect
index 6b8c2c7..9ed1508 100644
--- a/pkg/front_end/testcases/enhanced_enums/declared_hashcode.dart.strong.expect
+++ b/pkg/front_end/testcases/enhanced_enums/declared_hashcode.dart.strong.expect

@@ -307,8 +307,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///declared_hashcode.dart:
 - E1. (from org-dartlang-testcase:///declared_hashcode.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///declared_hashcode.dart:11:6)
 - E3. (from org-dartlang-testcase:///declared_hashcode.dart:17:6)
 - E4. (from org-dartlang-testcase:///declared_hashcode.dart:23:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/declared_hashcode.dart.weak.expect b/pkg/front_end/testcases/enhanced_enums/declared_hashcode.dart.weak.expect
index 5a348b0..1f7057f 100644
--- a/pkg/front_end/testcases/enhanced_enums/declared_hashcode.dart.weak.expect
+++ b/pkg/front_end/testcases/enhanced_enums/declared_hashcode.dart.weak.expect

@@ -307,8 +307,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///declared_hashcode.dart:
 - E1. (from org-dartlang-testcase:///declared_hashcode.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///declared_hashcode.dart:11:6)
 - E3. (from org-dartlang-testcase:///declared_hashcode.dart:17:6)
 - E4. (from org-dartlang-testcase:///declared_hashcode.dart:23:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/declared_hashcode.dart.weak.modular.expect b/pkg/front_end/testcases/enhanced_enums/declared_hashcode.dart.weak.modular.expect
index 5a348b0..1f7057f 100644
--- a/pkg/front_end/testcases/enhanced_enums/declared_hashcode.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/enhanced_enums/declared_hashcode.dart.weak.modular.expect

@@ -307,8 +307,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///declared_hashcode.dart:
 - E1. (from org-dartlang-testcase:///declared_hashcode.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///declared_hashcode.dart:11:6)
 - E3. (from org-dartlang-testcase:///declared_hashcode.dart:17:6)
 - E4. (from org-dartlang-testcase:///declared_hashcode.dart:23:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/declared_index.dart.strong.expect b/pkg/front_end/testcases/enhanced_enums/declared_index.dart.strong.expect
index 76ae5ec..c6c6e34 100644
--- a/pkg/front_end/testcases/enhanced_enums/declared_index.dart.strong.expect
+++ b/pkg/front_end/testcases/enhanced_enums/declared_index.dart.strong.expect

@@ -307,8 +307,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///declared_index.dart:
 - E1. (from org-dartlang-testcase:///declared_index.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///declared_index.dart:11:6)
 - E3. (from org-dartlang-testcase:///declared_index.dart:17:6)
 - E4. (from org-dartlang-testcase:///declared_index.dart:23:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/declared_index.dart.weak.expect b/pkg/front_end/testcases/enhanced_enums/declared_index.dart.weak.expect
index 16596f7..7564912 100644
--- a/pkg/front_end/testcases/enhanced_enums/declared_index.dart.weak.expect
+++ b/pkg/front_end/testcases/enhanced_enums/declared_index.dart.weak.expect

@@ -307,8 +307,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///declared_index.dart:
 - E1. (from org-dartlang-testcase:///declared_index.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///declared_index.dart:11:6)
 - E3. (from org-dartlang-testcase:///declared_index.dart:17:6)
 - E4. (from org-dartlang-testcase:///declared_index.dart:23:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/declared_index.dart.weak.modular.expect b/pkg/front_end/testcases/enhanced_enums/declared_index.dart.weak.modular.expect
index 16596f7..7564912 100644
--- a/pkg/front_end/testcases/enhanced_enums/declared_index.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/enhanced_enums/declared_index.dart.weak.modular.expect

@@ -307,8 +307,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///declared_index.dart:
 - E1. (from org-dartlang-testcase:///declared_index.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///declared_index.dart:11:6)
 - E3. (from org-dartlang-testcase:///declared_index.dart:17:6)
 - E4. (from org-dartlang-testcase:///declared_index.dart:23:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/declared_values.dart.strong.expect b/pkg/front_end/testcases/enhanced_enums/declared_values.dart.strong.expect
index eb6433c4..92156a8 100644
--- a/pkg/front_end/testcases/enhanced_enums/declared_values.dart.strong.expect
+++ b/pkg/front_end/testcases/enhanced_enums/declared_values.dart.strong.expect

@@ -128,8 +128,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///declared_values.dart:
 - E1. (from org-dartlang-testcase:///declared_values.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///declared_values.dart:11:6)
 - E3. (from org-dartlang-testcase:///declared_values.dart:17:6)
 - E4. (from org-dartlang-testcase:///declared_values.dart:24:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/declared_values.dart.strong.transformed.expect b/pkg/front_end/testcases/enhanced_enums/declared_values.dart.strong.transformed.expect
index eb6433c4..92156a8 100644
--- a/pkg/front_end/testcases/enhanced_enums/declared_values.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/declared_values.dart.strong.transformed.expect

@@ -128,8 +128,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///declared_values.dart:
 - E1. (from org-dartlang-testcase:///declared_values.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///declared_values.dart:11:6)
 - E3. (from org-dartlang-testcase:///declared_values.dart:17:6)
 - E4. (from org-dartlang-testcase:///declared_values.dart:24:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/declared_values.dart.weak.expect b/pkg/front_end/testcases/enhanced_enums/declared_values.dart.weak.expect
index 7f534fe..6206c0a 100644
--- a/pkg/front_end/testcases/enhanced_enums/declared_values.dart.weak.expect
+++ b/pkg/front_end/testcases/enhanced_enums/declared_values.dart.weak.expect

@@ -128,8 +128,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///declared_values.dart:
 - E1. (from org-dartlang-testcase:///declared_values.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///declared_values.dart:11:6)
 - E3. (from org-dartlang-testcase:///declared_values.dart:17:6)
 - E4. (from org-dartlang-testcase:///declared_values.dart:24:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/declared_values.dart.weak.modular.expect b/pkg/front_end/testcases/enhanced_enums/declared_values.dart.weak.modular.expect
index 7f534fe..6206c0a 100644
--- a/pkg/front_end/testcases/enhanced_enums/declared_values.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/enhanced_enums/declared_values.dart.weak.modular.expect

@@ -128,8 +128,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///declared_values.dart:
 - E1. (from org-dartlang-testcase:///declared_values.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///declared_values.dart:11:6)
 - E3. (from org-dartlang-testcase:///declared_values.dart:17:6)
 - E4. (from org-dartlang-testcase:///declared_values.dart:24:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/declared_values.dart.weak.transformed.expect b/pkg/front_end/testcases/enhanced_enums/declared_values.dart.weak.transformed.expect
index 7f534fe..6206c0a 100644
--- a/pkg/front_end/testcases/enhanced_enums/declared_values.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/declared_values.dart.weak.transformed.expect

@@ -128,8 +128,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///declared_values.dart:
 - E1. (from org-dartlang-testcase:///declared_values.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///declared_values.dart:11:6)
 - E3. (from org-dartlang-testcase:///declared_values.dart:17:6)
 - E4. (from org-dartlang-testcase:///declared_values.dart:24:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/entries_with_type_arguments.dart.strong.expect b/pkg/front_end/testcases/enhanced_enums/entries_with_type_arguments.dart.strong.expect
index 7f36b67..b0aefc0 100644
--- a/pkg/front_end/testcases/enhanced_enums/entries_with_type_arguments.dart.strong.expect
+++ b/pkg/front_end/testcases/enhanced_enums/entries_with_type_arguments.dart.strong.expect

@@ -46,6 +46,6 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///entries_with_type_arguments.dart:
 - E. (from org-dartlang-testcase:///entries_with_type_arguments.dart:11:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E.named (from org-dartlang-testcase:///entries_with_type_arguments.dart:12:9)

diff --git a/pkg/front_end/testcases/enhanced_enums/entries_with_type_arguments.dart.strong.transformed.expect b/pkg/front_end/testcases/enhanced_enums/entries_with_type_arguments.dart.strong.transformed.expect
index 7f36b67..b0aefc0 100644
--- a/pkg/front_end/testcases/enhanced_enums/entries_with_type_arguments.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/entries_with_type_arguments.dart.strong.transformed.expect

@@ -46,6 +46,6 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///entries_with_type_arguments.dart:
 - E. (from org-dartlang-testcase:///entries_with_type_arguments.dart:11:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E.named (from org-dartlang-testcase:///entries_with_type_arguments.dart:12:9)

diff --git a/pkg/front_end/testcases/enhanced_enums/entries_with_type_arguments.dart.weak.expect b/pkg/front_end/testcases/enhanced_enums/entries_with_type_arguments.dart.weak.expect
index a3a789d..2104c4f 100644
--- a/pkg/front_end/testcases/enhanced_enums/entries_with_type_arguments.dart.weak.expect
+++ b/pkg/front_end/testcases/enhanced_enums/entries_with_type_arguments.dart.weak.expect

@@ -46,6 +46,6 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///entries_with_type_arguments.dart:
 - E. (from org-dartlang-testcase:///entries_with_type_arguments.dart:11:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E.named (from org-dartlang-testcase:///entries_with_type_arguments.dart:12:9)

diff --git a/pkg/front_end/testcases/enhanced_enums/entries_with_type_arguments.dart.weak.modular.expect b/pkg/front_end/testcases/enhanced_enums/entries_with_type_arguments.dart.weak.modular.expect
index a3a789d..2104c4f 100644
--- a/pkg/front_end/testcases/enhanced_enums/entries_with_type_arguments.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/enhanced_enums/entries_with_type_arguments.dart.weak.modular.expect

@@ -46,6 +46,6 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///entries_with_type_arguments.dart:
 - E. (from org-dartlang-testcase:///entries_with_type_arguments.dart:11:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E.named (from org-dartlang-testcase:///entries_with_type_arguments.dart:12:9)

diff --git a/pkg/front_end/testcases/enhanced_enums/entries_with_type_arguments.dart.weak.transformed.expect b/pkg/front_end/testcases/enhanced_enums/entries_with_type_arguments.dart.weak.transformed.expect
index a3a789d..2104c4f 100644
--- a/pkg/front_end/testcases/enhanced_enums/entries_with_type_arguments.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/entries_with_type_arguments.dart.weak.transformed.expect

@@ -46,6 +46,6 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///entries_with_type_arguments.dart:
 - E. (from org-dartlang-testcase:///entries_with_type_arguments.dart:11:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E.named (from org-dartlang-testcase:///entries_with_type_arguments.dart:12:9)

diff --git a/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.strong.expect b/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.strong.expect
index 64e3b29f..51d9461 100644
--- a/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.strong.expect
+++ b/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.strong.expect

@@ -125,8 +125,8 @@
 org-dartlang-testcase:///enum_as_supertype.dart:
 - EA. (from org-dartlang-testcase:///enum_as_supertype.dart:9:6)
 - _EA&_Enum&A. (from org-dartlang-testcase:///enum_as_supertype.dart:9:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - EB. (from org-dartlang-testcase:///enum_as_supertype.dart:15:6)
 - _EB&_Enum&B. (from org-dartlang-testcase:///enum_as_supertype.dart:15:6)
 - EM. (from org-dartlang-testcase:///enum_as_supertype.dart:21:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.strong.transformed.expect b/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.strong.transformed.expect
index 8d2555e..9a4e90a 100644
--- a/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.strong.transformed.expect

@@ -125,8 +125,8 @@
 org-dartlang-testcase:///enum_as_supertype.dart:
 - EA. (from org-dartlang-testcase:///enum_as_supertype.dart:9:6)
 - _EA&_Enum&A. (from org-dartlang-testcase:///enum_as_supertype.dart:9:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - EB. (from org-dartlang-testcase:///enum_as_supertype.dart:15:6)
 - _EB&_Enum&B. (from org-dartlang-testcase:///enum_as_supertype.dart:15:6)
 - EM. (from org-dartlang-testcase:///enum_as_supertype.dart:21:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.weak.expect b/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.weak.expect
index a059a89..c85119f 100644
--- a/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.weak.expect
+++ b/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.weak.expect

@@ -125,8 +125,8 @@
 org-dartlang-testcase:///enum_as_supertype.dart:
 - EA. (from org-dartlang-testcase:///enum_as_supertype.dart:9:6)
 - _EA&_Enum&A. (from org-dartlang-testcase:///enum_as_supertype.dart:9:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - EB. (from org-dartlang-testcase:///enum_as_supertype.dart:15:6)
 - _EB&_Enum&B. (from org-dartlang-testcase:///enum_as_supertype.dart:15:6)
 - EM. (from org-dartlang-testcase:///enum_as_supertype.dart:21:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.weak.modular.expect b/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.weak.modular.expect
index a059a89..c85119f 100644
--- a/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.weak.modular.expect

@@ -125,8 +125,8 @@
 org-dartlang-testcase:///enum_as_supertype.dart:
 - EA. (from org-dartlang-testcase:///enum_as_supertype.dart:9:6)
 - _EA&_Enum&A. (from org-dartlang-testcase:///enum_as_supertype.dart:9:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - EB. (from org-dartlang-testcase:///enum_as_supertype.dart:15:6)
 - _EB&_Enum&B. (from org-dartlang-testcase:///enum_as_supertype.dart:15:6)
 - EM. (from org-dartlang-testcase:///enum_as_supertype.dart:21:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.weak.transformed.expect b/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.weak.transformed.expect
index d117fd5..4c8e59c 100644
--- a/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/enum_as_supertype.dart.weak.transformed.expect

@@ -125,8 +125,8 @@
 org-dartlang-testcase:///enum_as_supertype.dart:
 - EA. (from org-dartlang-testcase:///enum_as_supertype.dart:9:6)
 - _EA&_Enum&A. (from org-dartlang-testcase:///enum_as_supertype.dart:9:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - EB. (from org-dartlang-testcase:///enum_as_supertype.dart:15:6)
 - _EB&_Enum&B. (from org-dartlang-testcase:///enum_as_supertype.dart:15:6)
 - EM. (from org-dartlang-testcase:///enum_as_supertype.dart:21:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/inference_in_constructor_parameters.dart.strong.expect b/pkg/front_end/testcases/enhanced_enums/inference_in_constructor_parameters.dart.strong.expect
index a1718b3..4a45f58 100644
--- a/pkg/front_end/testcases/enhanced_enums/inference_in_constructor_parameters.dart.strong.expect
+++ b/pkg/front_end/testcases/enhanced_enums/inference_in_constructor_parameters.dart.strong.expect

@@ -49,7 +49,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///inference_in_constructor_parameters.dart:
 - E1. (from org-dartlang-testcase:///inference_in_constructor_parameters.dart:10:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///inference_in_constructor_parameters.dart:16:9)
 - E3. (from org-dartlang-testcase:///inference_in_constructor_parameters.dart:19:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/inference_in_constructor_parameters.dart.strong.transformed.expect b/pkg/front_end/testcases/enhanced_enums/inference_in_constructor_parameters.dart.strong.transformed.expect
index a1718b3..4a45f58 100644
--- a/pkg/front_end/testcases/enhanced_enums/inference_in_constructor_parameters.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/inference_in_constructor_parameters.dart.strong.transformed.expect

@@ -49,7 +49,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///inference_in_constructor_parameters.dart:
 - E1. (from org-dartlang-testcase:///inference_in_constructor_parameters.dart:10:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///inference_in_constructor_parameters.dart:16:9)
 - E3. (from org-dartlang-testcase:///inference_in_constructor_parameters.dart:19:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/inference_in_constructor_parameters.dart.weak.expect b/pkg/front_end/testcases/enhanced_enums/inference_in_constructor_parameters.dart.weak.expect
index c72859d..8623b8f 100644
--- a/pkg/front_end/testcases/enhanced_enums/inference_in_constructor_parameters.dart.weak.expect
+++ b/pkg/front_end/testcases/enhanced_enums/inference_in_constructor_parameters.dart.weak.expect

@@ -49,7 +49,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///inference_in_constructor_parameters.dart:
 - E1. (from org-dartlang-testcase:///inference_in_constructor_parameters.dart:10:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///inference_in_constructor_parameters.dart:16:9)
 - E3. (from org-dartlang-testcase:///inference_in_constructor_parameters.dart:19:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/inference_in_constructor_parameters.dart.weak.modular.expect b/pkg/front_end/testcases/enhanced_enums/inference_in_constructor_parameters.dart.weak.modular.expect
index c72859d..8623b8f 100644
--- a/pkg/front_end/testcases/enhanced_enums/inference_in_constructor_parameters.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/enhanced_enums/inference_in_constructor_parameters.dart.weak.modular.expect

@@ -49,7 +49,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///inference_in_constructor_parameters.dart:
 - E1. (from org-dartlang-testcase:///inference_in_constructor_parameters.dart:10:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///inference_in_constructor_parameters.dart:16:9)
 - E3. (from org-dartlang-testcase:///inference_in_constructor_parameters.dart:19:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/inference_in_constructor_parameters.dart.weak.transformed.expect b/pkg/front_end/testcases/enhanced_enums/inference_in_constructor_parameters.dart.weak.transformed.expect
index c72859d..8623b8f 100644
--- a/pkg/front_end/testcases/enhanced_enums/inference_in_constructor_parameters.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/inference_in_constructor_parameters.dart.weak.transformed.expect

@@ -49,7 +49,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///inference_in_constructor_parameters.dart:
 - E1. (from org-dartlang-testcase:///inference_in_constructor_parameters.dart:10:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///inference_in_constructor_parameters.dart:16:9)
 - E3. (from org-dartlang-testcase:///inference_in_constructor_parameters.dart:19:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/inherited_restricted_members.dart.strong.expect b/pkg/front_end/testcases/enhanced_enums/inherited_restricted_members.dart.strong.expect
index bbba884..cea2192 100644
--- a/pkg/front_end/testcases/enhanced_enums/inherited_restricted_members.dart.strong.expect
+++ b/pkg/front_end/testcases/enhanced_enums/inherited_restricted_members.dart.strong.expect

@@ -326,8 +326,8 @@
 org-dartlang-testcase:///inherited_restricted_members.dart:
 - E1. (from org-dartlang-testcase:///inherited_restricted_members.dart:9:6)
 - _E1&_Enum&A1. (from org-dartlang-testcase:///inherited_restricted_members.dart:9:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///inherited_restricted_members.dart:17:6)
 - _E2&_Enum&A2. (from org-dartlang-testcase:///inherited_restricted_members.dart:17:6)
 - E3. (from org-dartlang-testcase:///inherited_restricted_members.dart:25:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/inherited_restricted_members.dart.strong.transformed.expect b/pkg/front_end/testcases/enhanced_enums/inherited_restricted_members.dart.strong.transformed.expect
index cfa5422..4c433ba 100644
--- a/pkg/front_end/testcases/enhanced_enums/inherited_restricted_members.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/inherited_restricted_members.dart.strong.transformed.expect

@@ -326,8 +326,8 @@
 org-dartlang-testcase:///inherited_restricted_members.dart:
 - E1. (from org-dartlang-testcase:///inherited_restricted_members.dart:9:6)
 - _E1&_Enum&A1. (from org-dartlang-testcase:///inherited_restricted_members.dart:9:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///inherited_restricted_members.dart:17:6)
 - _E2&_Enum&A2. (from org-dartlang-testcase:///inherited_restricted_members.dart:17:6)
 - E3. (from org-dartlang-testcase:///inherited_restricted_members.dart:25:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/inherited_restricted_members.dart.weak.expect b/pkg/front_end/testcases/enhanced_enums/inherited_restricted_members.dart.weak.expect
index 1556195..4ce1fed 100644
--- a/pkg/front_end/testcases/enhanced_enums/inherited_restricted_members.dart.weak.expect
+++ b/pkg/front_end/testcases/enhanced_enums/inherited_restricted_members.dart.weak.expect

@@ -326,8 +326,8 @@
 org-dartlang-testcase:///inherited_restricted_members.dart:
 - E1. (from org-dartlang-testcase:///inherited_restricted_members.dart:9:6)
 - _E1&_Enum&A1. (from org-dartlang-testcase:///inherited_restricted_members.dart:9:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///inherited_restricted_members.dart:17:6)
 - _E2&_Enum&A2. (from org-dartlang-testcase:///inherited_restricted_members.dart:17:6)
 - E3. (from org-dartlang-testcase:///inherited_restricted_members.dart:25:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/inherited_restricted_members.dart.weak.modular.expect b/pkg/front_end/testcases/enhanced_enums/inherited_restricted_members.dart.weak.modular.expect
index 1556195..4ce1fed 100644
--- a/pkg/front_end/testcases/enhanced_enums/inherited_restricted_members.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/enhanced_enums/inherited_restricted_members.dart.weak.modular.expect

@@ -326,8 +326,8 @@
 org-dartlang-testcase:///inherited_restricted_members.dart:
 - E1. (from org-dartlang-testcase:///inherited_restricted_members.dart:9:6)
 - _E1&_Enum&A1. (from org-dartlang-testcase:///inherited_restricted_members.dart:9:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///inherited_restricted_members.dart:17:6)
 - _E2&_Enum&A2. (from org-dartlang-testcase:///inherited_restricted_members.dart:17:6)
 - E3. (from org-dartlang-testcase:///inherited_restricted_members.dart:25:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/inherited_restricted_members.dart.weak.transformed.expect b/pkg/front_end/testcases/enhanced_enums/inherited_restricted_members.dart.weak.transformed.expect
index 6c7bda3..9039f2b 100644
--- a/pkg/front_end/testcases/enhanced_enums/inherited_restricted_members.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/inherited_restricted_members.dart.weak.transformed.expect

@@ -326,8 +326,8 @@
 org-dartlang-testcase:///inherited_restricted_members.dart:
 - E1. (from org-dartlang-testcase:///inherited_restricted_members.dart:9:6)
 - _E1&_Enum&A1. (from org-dartlang-testcase:///inherited_restricted_members.dart:9:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///inherited_restricted_members.dart:17:6)
 - _E2&_Enum&A2. (from org-dartlang-testcase:///inherited_restricted_members.dart:17:6)
 - E3. (from org-dartlang-testcase:///inherited_restricted_members.dart:25:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/instantiated_generic_enum_types.dart.strong.expect b/pkg/front_end/testcases/enhanced_enums/instantiated_generic_enum_types.dart.strong.expect
index a09f4fc..5d0dfba 100644
--- a/pkg/front_end/testcases/enhanced_enums/instantiated_generic_enum_types.dart.strong.expect
+++ b/pkg/front_end/testcases/enhanced_enums/instantiated_generic_enum_types.dart.strong.expect

@@ -137,5 +137,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///instantiated_generic_enum_types.dart:
 - E. (from org-dartlang-testcase:///instantiated_generic_enum_types.dart:11:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/instantiated_generic_enum_types.dart.strong.transformed.expect b/pkg/front_end/testcases/enhanced_enums/instantiated_generic_enum_types.dart.strong.transformed.expect
index a09f4fc..5d0dfba 100644
--- a/pkg/front_end/testcases/enhanced_enums/instantiated_generic_enum_types.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/instantiated_generic_enum_types.dart.strong.transformed.expect

@@ -137,5 +137,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///instantiated_generic_enum_types.dart:
 - E. (from org-dartlang-testcase:///instantiated_generic_enum_types.dart:11:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/instantiated_generic_enum_types.dart.weak.expect b/pkg/front_end/testcases/enhanced_enums/instantiated_generic_enum_types.dart.weak.expect
index b4d7039..327b57b 100644
--- a/pkg/front_end/testcases/enhanced_enums/instantiated_generic_enum_types.dart.weak.expect
+++ b/pkg/front_end/testcases/enhanced_enums/instantiated_generic_enum_types.dart.weak.expect

@@ -137,5 +137,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///instantiated_generic_enum_types.dart:
 - E. (from org-dartlang-testcase:///instantiated_generic_enum_types.dart:11:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/instantiated_generic_enum_types.dart.weak.modular.expect b/pkg/front_end/testcases/enhanced_enums/instantiated_generic_enum_types.dart.weak.modular.expect
index b4d7039..327b57b 100644
--- a/pkg/front_end/testcases/enhanced_enums/instantiated_generic_enum_types.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/enhanced_enums/instantiated_generic_enum_types.dart.weak.modular.expect

@@ -137,5 +137,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///instantiated_generic_enum_types.dart:
 - E. (from org-dartlang-testcase:///instantiated_generic_enum_types.dart:11:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/instantiated_generic_enum_types.dart.weak.transformed.expect b/pkg/front_end/testcases/enhanced_enums/instantiated_generic_enum_types.dart.weak.transformed.expect
index b4d7039..327b57b 100644
--- a/pkg/front_end/testcases/enhanced_enums/instantiated_generic_enum_types.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/instantiated_generic_enum_types.dart.weak.transformed.expect

@@ -137,5 +137,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///instantiated_generic_enum_types.dart:
 - E. (from org-dartlang-testcase:///instantiated_generic_enum_types.dart:11:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/issue48084.dart.strong.expect b/pkg/front_end/testcases/enhanced_enums/issue48084.dart.strong.expect
index 80d05d0..c55cb8c 100644
--- a/pkg/front_end/testcases/enhanced_enums/issue48084.dart.strong.expect
+++ b/pkg/front_end/testcases/enhanced_enums/issue48084.dart.strong.expect

@@ -41,5 +41,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue48084.dart:
 - E. (from org-dartlang-testcase:///issue48084.dart:11:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/issue48084.dart.strong.transformed.expect b/pkg/front_end/testcases/enhanced_enums/issue48084.dart.strong.transformed.expect
index 80d05d0..c55cb8c 100644
--- a/pkg/front_end/testcases/enhanced_enums/issue48084.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/issue48084.dart.strong.transformed.expect

@@ -41,5 +41,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue48084.dart:
 - E. (from org-dartlang-testcase:///issue48084.dart:11:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/issue48084.dart.weak.expect b/pkg/front_end/testcases/enhanced_enums/issue48084.dart.weak.expect
index 44da769..d7d2d9d 100644
--- a/pkg/front_end/testcases/enhanced_enums/issue48084.dart.weak.expect
+++ b/pkg/front_end/testcases/enhanced_enums/issue48084.dart.weak.expect

@@ -41,5 +41,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue48084.dart:
 - E. (from org-dartlang-testcase:///issue48084.dart:11:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/issue48084.dart.weak.modular.expect b/pkg/front_end/testcases/enhanced_enums/issue48084.dart.weak.modular.expect
index 44da769..d7d2d9d 100644
--- a/pkg/front_end/testcases/enhanced_enums/issue48084.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/enhanced_enums/issue48084.dart.weak.modular.expect

@@ -41,5 +41,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue48084.dart:
 - E. (from org-dartlang-testcase:///issue48084.dart:11:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/issue48084.dart.weak.transformed.expect b/pkg/front_end/testcases/enhanced_enums/issue48084.dart.weak.transformed.expect
index 44da769..d7d2d9d 100644
--- a/pkg/front_end/testcases/enhanced_enums/issue48084.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/issue48084.dart.weak.transformed.expect

@@ -41,5 +41,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue48084.dart:
 - E. (from org-dartlang-testcase:///issue48084.dart:11:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/issue48181.dart.strong.expect b/pkg/front_end/testcases/enhanced_enums/issue48181.dart.strong.expect
index f062cb7..54a5b30 100644
--- a/pkg/front_end/testcases/enhanced_enums/issue48181.dart.strong.expect
+++ b/pkg/front_end/testcases/enhanced_enums/issue48181.dart.strong.expect

@@ -65,5 +65,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue48181.dart:
 - E. (from org-dartlang-testcase:///issue48181.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/issue48181.dart.strong.transformed.expect b/pkg/front_end/testcases/enhanced_enums/issue48181.dart.strong.transformed.expect
index f062cb7..54a5b30 100644
--- a/pkg/front_end/testcases/enhanced_enums/issue48181.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/issue48181.dart.strong.transformed.expect

@@ -65,5 +65,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue48181.dart:
 - E. (from org-dartlang-testcase:///issue48181.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/issue48181.dart.weak.expect b/pkg/front_end/testcases/enhanced_enums/issue48181.dart.weak.expect
index 3c3cc89..9a085d8 100644
--- a/pkg/front_end/testcases/enhanced_enums/issue48181.dart.weak.expect
+++ b/pkg/front_end/testcases/enhanced_enums/issue48181.dart.weak.expect

@@ -65,5 +65,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue48181.dart:
 - E. (from org-dartlang-testcase:///issue48181.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/issue48181.dart.weak.modular.expect b/pkg/front_end/testcases/enhanced_enums/issue48181.dart.weak.modular.expect
index 3c3cc89..9a085d8 100644
--- a/pkg/front_end/testcases/enhanced_enums/issue48181.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/enhanced_enums/issue48181.dart.weak.modular.expect

@@ -65,5 +65,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue48181.dart:
 - E. (from org-dartlang-testcase:///issue48181.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/issue48181.dart.weak.transformed.expect b/pkg/front_end/testcases/enhanced_enums/issue48181.dart.weak.transformed.expect
index 3c3cc89..9a085d8 100644
--- a/pkg/front_end/testcases/enhanced_enums/issue48181.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/issue48181.dart.weak.transformed.expect

@@ -65,5 +65,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue48181.dart:
 - E. (from org-dartlang-testcase:///issue48181.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/issue48232.dart.strong.expect b/pkg/front_end/testcases/enhanced_enums/issue48232.dart.strong.expect
index 634e147..7e7d7b7 100644
--- a/pkg/front_end/testcases/enhanced_enums/issue48232.dart.strong.expect
+++ b/pkg/front_end/testcases/enhanced_enums/issue48232.dart.strong.expect

@@ -24,5 +24,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue48232.dart:
 - E. (from org-dartlang-testcase:///issue48232.dart:7:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/issue48232.dart.strong.transformed.expect b/pkg/front_end/testcases/enhanced_enums/issue48232.dart.strong.transformed.expect
index 634e147..7e7d7b7 100644
--- a/pkg/front_end/testcases/enhanced_enums/issue48232.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/issue48232.dart.strong.transformed.expect

@@ -24,5 +24,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue48232.dart:
 - E. (from org-dartlang-testcase:///issue48232.dart:7:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/issue48232.dart.weak.expect b/pkg/front_end/testcases/enhanced_enums/issue48232.dart.weak.expect
index 96a123e..79c1ad3 100644
--- a/pkg/front_end/testcases/enhanced_enums/issue48232.dart.weak.expect
+++ b/pkg/front_end/testcases/enhanced_enums/issue48232.dart.weak.expect

@@ -24,5 +24,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue48232.dart:
 - E. (from org-dartlang-testcase:///issue48232.dart:7:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/issue48232.dart.weak.modular.expect b/pkg/front_end/testcases/enhanced_enums/issue48232.dart.weak.modular.expect
index 96a123e..79c1ad3 100644
--- a/pkg/front_end/testcases/enhanced_enums/issue48232.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/enhanced_enums/issue48232.dart.weak.modular.expect

@@ -24,5 +24,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue48232.dart:
 - E. (from org-dartlang-testcase:///issue48232.dart:7:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/issue48232.dart.weak.transformed.expect b/pkg/front_end/testcases/enhanced_enums/issue48232.dart.weak.transformed.expect
index 96a123e..79c1ad3 100644
--- a/pkg/front_end/testcases/enhanced_enums/issue48232.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/issue48232.dart.weak.transformed.expect

@@ -24,5 +24,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue48232.dart:
 - E. (from org-dartlang-testcase:///issue48232.dart:7:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/issue48303.dart.strong.expect b/pkg/front_end/testcases/enhanced_enums/issue48303.dart.strong.expect
index 13f3a0c..c296fc6 100644
--- a/pkg/front_end/testcases/enhanced_enums/issue48303.dart.strong.expect
+++ b/pkg/front_end/testcases/enhanced_enums/issue48303.dart.strong.expect

@@ -51,5 +51,5 @@
 org-dartlang-testcase:///issue48303.dart:
 - E. (from org-dartlang-testcase:///issue48303.dart:9:6)
 - _E&_Enum&M1. (from org-dartlang-testcase:///issue48303.dart:9:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/issue48303.dart.strong.transformed.expect b/pkg/front_end/testcases/enhanced_enums/issue48303.dart.strong.transformed.expect
index 453368a..59ac2ed 100644
--- a/pkg/front_end/testcases/enhanced_enums/issue48303.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/issue48303.dart.strong.transformed.expect

@@ -51,5 +51,5 @@
 org-dartlang-testcase:///issue48303.dart:
 - E. (from org-dartlang-testcase:///issue48303.dart:9:6)
 - _E&_Enum&M1. (from org-dartlang-testcase:///issue48303.dart:9:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/issue48303.dart.weak.expect b/pkg/front_end/testcases/enhanced_enums/issue48303.dart.weak.expect
index f096f3a..9f4e59d 100644
--- a/pkg/front_end/testcases/enhanced_enums/issue48303.dart.weak.expect
+++ b/pkg/front_end/testcases/enhanced_enums/issue48303.dart.weak.expect

@@ -51,5 +51,5 @@
 org-dartlang-testcase:///issue48303.dart:
 - E. (from org-dartlang-testcase:///issue48303.dart:9:6)
 - _E&_Enum&M1. (from org-dartlang-testcase:///issue48303.dart:9:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/issue48303.dart.weak.modular.expect b/pkg/front_end/testcases/enhanced_enums/issue48303.dart.weak.modular.expect
index f096f3a..9f4e59d 100644
--- a/pkg/front_end/testcases/enhanced_enums/issue48303.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/enhanced_enums/issue48303.dart.weak.modular.expect

@@ -51,5 +51,5 @@
 org-dartlang-testcase:///issue48303.dart:
 - E. (from org-dartlang-testcase:///issue48303.dart:9:6)
 - _E&_Enum&M1. (from org-dartlang-testcase:///issue48303.dart:9:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/issue48303.dart.weak.transformed.expect b/pkg/front_end/testcases/enhanced_enums/issue48303.dart.weak.transformed.expect
index 9332629..5d5fcee 100644
--- a/pkg/front_end/testcases/enhanced_enums/issue48303.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/issue48303.dart.weak.transformed.expect

@@ -51,5 +51,5 @@
 org-dartlang-testcase:///issue48303.dart:
 - E. (from org-dartlang-testcase:///issue48303.dart:9:6)
 - _E&_Enum&M1. (from org-dartlang-testcase:///issue48303.dart:9:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/issue49236.dart.strong.expect b/pkg/front_end/testcases/enhanced_enums/issue49236.dart.strong.expect
index bf8ee4f..9540204 100644
--- a/pkg/front_end/testcases/enhanced_enums/issue49236.dart.strong.expect
+++ b/pkg/front_end/testcases/enhanced_enums/issue49236.dart.strong.expect

@@ -150,8 +150,8 @@
 org-dartlang-testcase:///issue49236.dart:
 - E1. (from org-dartlang-testcase:///issue49236.dart:17:6)
 - _E1&_Enum&M. (from org-dartlang-testcase:///issue49236.dart:17:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///issue49236.dart:21:6)
 - _E2&_Enum&M. (from org-dartlang-testcase:///issue49236.dart:21:6)
 - E3. (from org-dartlang-testcase:///issue49236.dart:27:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/issue49236.dart.strong.transformed.expect b/pkg/front_end/testcases/enhanced_enums/issue49236.dart.strong.transformed.expect
index b1cce1b..7ed64e4 100644
--- a/pkg/front_end/testcases/enhanced_enums/issue49236.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/issue49236.dart.strong.transformed.expect

@@ -150,8 +150,8 @@
 org-dartlang-testcase:///issue49236.dart:
 - E1. (from org-dartlang-testcase:///issue49236.dart:17:6)
 - _E1&_Enum&M. (from org-dartlang-testcase:///issue49236.dart:17:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///issue49236.dart:21:6)
 - _E2&_Enum&M. (from org-dartlang-testcase:///issue49236.dart:21:6)
 - E3. (from org-dartlang-testcase:///issue49236.dart:27:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/issue49236.dart.weak.expect b/pkg/front_end/testcases/enhanced_enums/issue49236.dart.weak.expect
index e3996a0..e496fa9 100644
--- a/pkg/front_end/testcases/enhanced_enums/issue49236.dart.weak.expect
+++ b/pkg/front_end/testcases/enhanced_enums/issue49236.dart.weak.expect

@@ -150,8 +150,8 @@
 org-dartlang-testcase:///issue49236.dart:
 - E1. (from org-dartlang-testcase:///issue49236.dart:17:6)
 - _E1&_Enum&M. (from org-dartlang-testcase:///issue49236.dart:17:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///issue49236.dart:21:6)
 - _E2&_Enum&M. (from org-dartlang-testcase:///issue49236.dart:21:6)
 - E3. (from org-dartlang-testcase:///issue49236.dart:27:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/issue49236.dart.weak.modular.expect b/pkg/front_end/testcases/enhanced_enums/issue49236.dart.weak.modular.expect
index e3996a0..e496fa9 100644
--- a/pkg/front_end/testcases/enhanced_enums/issue49236.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/enhanced_enums/issue49236.dart.weak.modular.expect

@@ -150,8 +150,8 @@
 org-dartlang-testcase:///issue49236.dart:
 - E1. (from org-dartlang-testcase:///issue49236.dart:17:6)
 - _E1&_Enum&M. (from org-dartlang-testcase:///issue49236.dart:17:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///issue49236.dart:21:6)
 - _E2&_Enum&M. (from org-dartlang-testcase:///issue49236.dart:21:6)
 - E3. (from org-dartlang-testcase:///issue49236.dart:27:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/issue49236.dart.weak.transformed.expect b/pkg/front_end/testcases/enhanced_enums/issue49236.dart.weak.transformed.expect
index c6df72d..0cc61e0 100644
--- a/pkg/front_end/testcases/enhanced_enums/issue49236.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/issue49236.dart.weak.transformed.expect

@@ -150,8 +150,8 @@
 org-dartlang-testcase:///issue49236.dart:
 - E1. (from org-dartlang-testcase:///issue49236.dart:17:6)
 - _E1&_Enum&M. (from org-dartlang-testcase:///issue49236.dart:17:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///issue49236.dart:21:6)
 - _E2&_Enum&M. (from org-dartlang-testcase:///issue49236.dart:21:6)
 - E3. (from org-dartlang-testcase:///issue49236.dart:27:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/member_values_conflicts.dart.strong.expect b/pkg/front_end/testcases/enhanced_enums/member_values_conflicts.dart.strong.expect
index 49a7cc0..46c2f6e 100644
--- a/pkg/front_end/testcases/enhanced_enums/member_values_conflicts.dart.strong.expect
+++ b/pkg/front_end/testcases/enhanced_enums/member_values_conflicts.dart.strong.expect

@@ -36,5 +36,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///member_values_conflicts.dart:
 - E. (from org-dartlang-testcase:///member_values_conflicts.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/member_values_conflicts.dart.strong.transformed.expect b/pkg/front_end/testcases/enhanced_enums/member_values_conflicts.dart.strong.transformed.expect
index 49a7cc0..46c2f6e 100644
--- a/pkg/front_end/testcases/enhanced_enums/member_values_conflicts.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/member_values_conflicts.dart.strong.transformed.expect

@@ -36,5 +36,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///member_values_conflicts.dart:
 - E. (from org-dartlang-testcase:///member_values_conflicts.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/member_values_conflicts.dart.weak.expect b/pkg/front_end/testcases/enhanced_enums/member_values_conflicts.dart.weak.expect
index e8cdf0b..9509aed 100644
--- a/pkg/front_end/testcases/enhanced_enums/member_values_conflicts.dart.weak.expect
+++ b/pkg/front_end/testcases/enhanced_enums/member_values_conflicts.dart.weak.expect

@@ -36,5 +36,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///member_values_conflicts.dart:
 - E. (from org-dartlang-testcase:///member_values_conflicts.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/member_values_conflicts.dart.weak.modular.expect b/pkg/front_end/testcases/enhanced_enums/member_values_conflicts.dart.weak.modular.expect
index e8cdf0b..9509aed 100644
--- a/pkg/front_end/testcases/enhanced_enums/member_values_conflicts.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/enhanced_enums/member_values_conflicts.dart.weak.modular.expect

@@ -36,5 +36,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///member_values_conflicts.dart:
 - E. (from org-dartlang-testcase:///member_values_conflicts.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/member_values_conflicts.dart.weak.transformed.expect b/pkg/front_end/testcases/enhanced_enums/member_values_conflicts.dart.weak.transformed.expect
index e8cdf0b..9509aed 100644
--- a/pkg/front_end/testcases/enhanced_enums/member_values_conflicts.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/member_values_conflicts.dart.weak.transformed.expect

@@ -36,5 +36,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///member_values_conflicts.dart:
 - E. (from org-dartlang-testcase:///member_values_conflicts.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/members.dart.strong.expect b/pkg/front_end/testcases/enhanced_enums/members.dart.strong.expect
index 81da909..3e9c129 100644
--- a/pkg/front_end/testcases/enhanced_enums/members.dart.strong.expect
+++ b/pkg/front_end/testcases/enhanced_enums/members.dart.strong.expect

@@ -63,6 +63,6 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///members.dart:
 - E. (from org-dartlang-testcase:///members.dart:14:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///members.dart:32:9)

diff --git a/pkg/front_end/testcases/enhanced_enums/members.dart.strong.transformed.expect b/pkg/front_end/testcases/enhanced_enums/members.dart.strong.transformed.expect
index 81da909..3e9c129 100644
--- a/pkg/front_end/testcases/enhanced_enums/members.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/members.dart.strong.transformed.expect

@@ -63,6 +63,6 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///members.dart:
 - E. (from org-dartlang-testcase:///members.dart:14:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///members.dart:32:9)

diff --git a/pkg/front_end/testcases/enhanced_enums/members.dart.weak.expect b/pkg/front_end/testcases/enhanced_enums/members.dart.weak.expect
index a1cd3da..15d6e20 100644
--- a/pkg/front_end/testcases/enhanced_enums/members.dart.weak.expect
+++ b/pkg/front_end/testcases/enhanced_enums/members.dart.weak.expect

@@ -63,6 +63,6 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///members.dart:
 - E. (from org-dartlang-testcase:///members.dart:14:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///members.dart:32:9)

diff --git a/pkg/front_end/testcases/enhanced_enums/members.dart.weak.modular.expect b/pkg/front_end/testcases/enhanced_enums/members.dart.weak.modular.expect
index a1cd3da..15d6e20 100644
--- a/pkg/front_end/testcases/enhanced_enums/members.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/enhanced_enums/members.dart.weak.modular.expect

@@ -63,6 +63,6 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///members.dart:
 - E. (from org-dartlang-testcase:///members.dart:14:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///members.dart:32:9)

diff --git a/pkg/front_end/testcases/enhanced_enums/members.dart.weak.transformed.expect b/pkg/front_end/testcases/enhanced_enums/members.dart.weak.transformed.expect
index a1cd3da..15d6e20 100644
--- a/pkg/front_end/testcases/enhanced_enums/members.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/members.dart.weak.transformed.expect

@@ -63,6 +63,6 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///members.dart:
 - E. (from org-dartlang-testcase:///members.dart:14:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///members.dart:32:9)

diff --git a/pkg/front_end/testcases/enhanced_enums/named_arguments.dart.strong.expect b/pkg/front_end/testcases/enhanced_enums/named_arguments.dart.strong.expect
index c6b555c..7efcb05 100644
--- a/pkg/front_end/testcases/enhanced_enums/named_arguments.dart.strong.expect
+++ b/pkg/front_end/testcases/enhanced_enums/named_arguments.dart.strong.expect

@@ -70,7 +70,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///named_arguments.dart:
 - E0. (from org-dartlang-testcase:///named_arguments.dart:12:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E1. (from org-dartlang-testcase:///named_arguments.dart:21:9)
 - E2. (from org-dartlang-testcase:///named_arguments.dart:33:9)

diff --git a/pkg/front_end/testcases/enhanced_enums/named_arguments.dart.strong.transformed.expect b/pkg/front_end/testcases/enhanced_enums/named_arguments.dart.strong.transformed.expect
index c6b555c..7efcb05 100644
--- a/pkg/front_end/testcases/enhanced_enums/named_arguments.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/named_arguments.dart.strong.transformed.expect

@@ -70,7 +70,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///named_arguments.dart:
 - E0. (from org-dartlang-testcase:///named_arguments.dart:12:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E1. (from org-dartlang-testcase:///named_arguments.dart:21:9)
 - E2. (from org-dartlang-testcase:///named_arguments.dart:33:9)

diff --git a/pkg/front_end/testcases/enhanced_enums/named_arguments.dart.weak.expect b/pkg/front_end/testcases/enhanced_enums/named_arguments.dart.weak.expect
index 04b9df2..d896894 100644
--- a/pkg/front_end/testcases/enhanced_enums/named_arguments.dart.weak.expect
+++ b/pkg/front_end/testcases/enhanced_enums/named_arguments.dart.weak.expect

@@ -70,7 +70,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///named_arguments.dart:
 - E0. (from org-dartlang-testcase:///named_arguments.dart:12:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E1. (from org-dartlang-testcase:///named_arguments.dart:21:9)
 - E2. (from org-dartlang-testcase:///named_arguments.dart:33:9)

diff --git a/pkg/front_end/testcases/enhanced_enums/named_arguments.dart.weak.modular.expect b/pkg/front_end/testcases/enhanced_enums/named_arguments.dart.weak.modular.expect
index 04b9df2..d896894 100644
--- a/pkg/front_end/testcases/enhanced_enums/named_arguments.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/enhanced_enums/named_arguments.dart.weak.modular.expect

@@ -70,7 +70,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///named_arguments.dart:
 - E0. (from org-dartlang-testcase:///named_arguments.dart:12:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E1. (from org-dartlang-testcase:///named_arguments.dart:21:9)
 - E2. (from org-dartlang-testcase:///named_arguments.dart:33:9)

diff --git a/pkg/front_end/testcases/enhanced_enums/named_arguments.dart.weak.transformed.expect b/pkg/front_end/testcases/enhanced_enums/named_arguments.dart.weak.transformed.expect
index 04b9df2..d896894 100644
--- a/pkg/front_end/testcases/enhanced_enums/named_arguments.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/named_arguments.dart.weak.transformed.expect

@@ -70,7 +70,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///named_arguments.dart:
 - E0. (from org-dartlang-testcase:///named_arguments.dart:12:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E1. (from org-dartlang-testcase:///named_arguments.dart:21:9)
 - E2. (from org-dartlang-testcase:///named_arguments.dart:33:9)

diff --git a/pkg/front_end/testcases/enhanced_enums/named_arguments_anywhere/redirecting_constructor.dart.strong.expect b/pkg/front_end/testcases/enhanced_enums/named_arguments_anywhere/redirecting_constructor.dart.strong.expect
index 4bc27a3..593cd7d 100644
--- a/pkg/front_end/testcases/enhanced_enums/named_arguments_anywhere/redirecting_constructor.dart.strong.expect
+++ b/pkg/front_end/testcases/enhanced_enums/named_arguments_anywhere/redirecting_constructor.dart.strong.expect

@@ -67,8 +67,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///redirecting_constructor.dart:
 - C. (from org-dartlang-testcase:///redirecting_constructor.dart:16:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - C.named1 (from org-dartlang-testcase:///redirecting_constructor.dart:19:9)
 - C.named2 (from org-dartlang-testcase:///redirecting_constructor.dart:20:9)
 - C.named3 (from org-dartlang-testcase:///redirecting_constructor.dart:21:9)

diff --git a/pkg/front_end/testcases/enhanced_enums/named_arguments_anywhere/redirecting_constructor.dart.strong.transformed.expect b/pkg/front_end/testcases/enhanced_enums/named_arguments_anywhere/redirecting_constructor.dart.strong.transformed.expect
index 4bc27a3..593cd7d 100644
--- a/pkg/front_end/testcases/enhanced_enums/named_arguments_anywhere/redirecting_constructor.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/named_arguments_anywhere/redirecting_constructor.dart.strong.transformed.expect

@@ -67,8 +67,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///redirecting_constructor.dart:
 - C. (from org-dartlang-testcase:///redirecting_constructor.dart:16:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - C.named1 (from org-dartlang-testcase:///redirecting_constructor.dart:19:9)
 - C.named2 (from org-dartlang-testcase:///redirecting_constructor.dart:20:9)
 - C.named3 (from org-dartlang-testcase:///redirecting_constructor.dart:21:9)

diff --git a/pkg/front_end/testcases/enhanced_enums/named_arguments_anywhere/redirecting_constructor.dart.weak.expect b/pkg/front_end/testcases/enhanced_enums/named_arguments_anywhere/redirecting_constructor.dart.weak.expect
index e5a2de2..7f5af29 100644
--- a/pkg/front_end/testcases/enhanced_enums/named_arguments_anywhere/redirecting_constructor.dart.weak.expect
+++ b/pkg/front_end/testcases/enhanced_enums/named_arguments_anywhere/redirecting_constructor.dart.weak.expect

@@ -67,8 +67,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///redirecting_constructor.dart:
 - C. (from org-dartlang-testcase:///redirecting_constructor.dart:16:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - C.named1 (from org-dartlang-testcase:///redirecting_constructor.dart:19:9)
 - C.named2 (from org-dartlang-testcase:///redirecting_constructor.dart:20:9)
 - C.named3 (from org-dartlang-testcase:///redirecting_constructor.dart:21:9)

diff --git a/pkg/front_end/testcases/enhanced_enums/named_arguments_anywhere/redirecting_constructor.dart.weak.modular.expect b/pkg/front_end/testcases/enhanced_enums/named_arguments_anywhere/redirecting_constructor.dart.weak.modular.expect
index e5a2de2..7f5af29 100644
--- a/pkg/front_end/testcases/enhanced_enums/named_arguments_anywhere/redirecting_constructor.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/enhanced_enums/named_arguments_anywhere/redirecting_constructor.dart.weak.modular.expect

@@ -67,8 +67,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///redirecting_constructor.dart:
 - C. (from org-dartlang-testcase:///redirecting_constructor.dart:16:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - C.named1 (from org-dartlang-testcase:///redirecting_constructor.dart:19:9)
 - C.named2 (from org-dartlang-testcase:///redirecting_constructor.dart:20:9)
 - C.named3 (from org-dartlang-testcase:///redirecting_constructor.dart:21:9)

diff --git a/pkg/front_end/testcases/enhanced_enums/named_arguments_anywhere/redirecting_constructor.dart.weak.transformed.expect b/pkg/front_end/testcases/enhanced_enums/named_arguments_anywhere/redirecting_constructor.dart.weak.transformed.expect
index e5a2de2..7f5af29 100644
--- a/pkg/front_end/testcases/enhanced_enums/named_arguments_anywhere/redirecting_constructor.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/named_arguments_anywhere/redirecting_constructor.dart.weak.transformed.expect

@@ -67,8 +67,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///redirecting_constructor.dart:
 - C. (from org-dartlang-testcase:///redirecting_constructor.dart:16:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - C.named1 (from org-dartlang-testcase:///redirecting_constructor.dart:19:9)
 - C.named2 (from org-dartlang-testcase:///redirecting_constructor.dart:20:9)
 - C.named3 (from org-dartlang-testcase:///redirecting_constructor.dart:21:9)

diff --git a/pkg/front_end/testcases/enhanced_enums/qualified_names_with_no_type_arguments.dart.strong.expect b/pkg/front_end/testcases/enhanced_enums/qualified_names_with_no_type_arguments.dart.strong.expect
index 6146329..02624d0 100644
--- a/pkg/front_end/testcases/enhanced_enums/qualified_names_with_no_type_arguments.dart.strong.expect
+++ b/pkg/front_end/testcases/enhanced_enums/qualified_names_with_no_type_arguments.dart.strong.expect

@@ -24,5 +24,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///qualified_names_with_no_type_arguments.dart:
 - E.b (from org-dartlang-testcase:///qualified_names_with_no_type_arguments.dart:8:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/qualified_names_with_no_type_arguments.dart.strong.transformed.expect b/pkg/front_end/testcases/enhanced_enums/qualified_names_with_no_type_arguments.dart.strong.transformed.expect
index 6146329..02624d0 100644
--- a/pkg/front_end/testcases/enhanced_enums/qualified_names_with_no_type_arguments.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/qualified_names_with_no_type_arguments.dart.strong.transformed.expect

@@ -24,5 +24,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///qualified_names_with_no_type_arguments.dart:
 - E.b (from org-dartlang-testcase:///qualified_names_with_no_type_arguments.dart:8:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/qualified_names_with_no_type_arguments.dart.weak.expect b/pkg/front_end/testcases/enhanced_enums/qualified_names_with_no_type_arguments.dart.weak.expect
index 5c2f45b..1e4397a 100644
--- a/pkg/front_end/testcases/enhanced_enums/qualified_names_with_no_type_arguments.dart.weak.expect
+++ b/pkg/front_end/testcases/enhanced_enums/qualified_names_with_no_type_arguments.dart.weak.expect

@@ -24,5 +24,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///qualified_names_with_no_type_arguments.dart:
 - E.b (from org-dartlang-testcase:///qualified_names_with_no_type_arguments.dart:8:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/qualified_names_with_no_type_arguments.dart.weak.modular.expect b/pkg/front_end/testcases/enhanced_enums/qualified_names_with_no_type_arguments.dart.weak.modular.expect
index 5c2f45b..1e4397a 100644
--- a/pkg/front_end/testcases/enhanced_enums/qualified_names_with_no_type_arguments.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/enhanced_enums/qualified_names_with_no_type_arguments.dart.weak.modular.expect

@@ -24,5 +24,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///qualified_names_with_no_type_arguments.dart:
 - E.b (from org-dartlang-testcase:///qualified_names_with_no_type_arguments.dart:8:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/qualified_names_with_no_type_arguments.dart.weak.transformed.expect b/pkg/front_end/testcases/enhanced_enums/qualified_names_with_no_type_arguments.dart.weak.transformed.expect
index 5c2f45b..1e4397a 100644
--- a/pkg/front_end/testcases/enhanced_enums/qualified_names_with_no_type_arguments.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/qualified_names_with_no_type_arguments.dart.weak.transformed.expect

@@ -24,5 +24,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///qualified_names_with_no_type_arguments.dart:
 - E.b (from org-dartlang-testcase:///qualified_names_with_no_type_arguments.dart:8:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/recovery_in_elements.dart.strong.expect b/pkg/front_end/testcases/enhanced_enums/recovery_in_elements.dart.strong.expect
index d8c0828..27b8cb0 100644
--- a/pkg/front_end/testcases/enhanced_enums/recovery_in_elements.dart.strong.expect
+++ b/pkg/front_end/testcases/enhanced_enums/recovery_in_elements.dart.strong.expect

@@ -39,5 +39,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///recovery_in_elements.dart:
 - E. (from org-dartlang-testcase:///recovery_in_elements.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/recovery_in_elements.dart.strong.transformed.expect b/pkg/front_end/testcases/enhanced_enums/recovery_in_elements.dart.strong.transformed.expect
index d8c0828..27b8cb0 100644
--- a/pkg/front_end/testcases/enhanced_enums/recovery_in_elements.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/recovery_in_elements.dart.strong.transformed.expect

@@ -39,5 +39,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///recovery_in_elements.dart:
 - E. (from org-dartlang-testcase:///recovery_in_elements.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/recovery_in_elements.dart.weak.expect b/pkg/front_end/testcases/enhanced_enums/recovery_in_elements.dart.weak.expect
index 0e3991a5..1fa3a91 100644
--- a/pkg/front_end/testcases/enhanced_enums/recovery_in_elements.dart.weak.expect
+++ b/pkg/front_end/testcases/enhanced_enums/recovery_in_elements.dart.weak.expect

@@ -39,5 +39,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///recovery_in_elements.dart:
 - E. (from org-dartlang-testcase:///recovery_in_elements.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/recovery_in_elements.dart.weak.modular.expect b/pkg/front_end/testcases/enhanced_enums/recovery_in_elements.dart.weak.modular.expect
index 0e3991a5..1fa3a91 100644
--- a/pkg/front_end/testcases/enhanced_enums/recovery_in_elements.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/enhanced_enums/recovery_in_elements.dart.weak.modular.expect

@@ -39,5 +39,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///recovery_in_elements.dart:
 - E. (from org-dartlang-testcase:///recovery_in_elements.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/recovery_in_elements.dart.weak.transformed.expect b/pkg/front_end/testcases/enhanced_enums/recovery_in_elements.dart.weak.transformed.expect
index 0e3991a5..1fa3a91 100644
--- a/pkg/front_end/testcases/enhanced_enums/recovery_in_elements.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/recovery_in_elements.dart.weak.transformed.expect

@@ -39,5 +39,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///recovery_in_elements.dart:
 - E. (from org-dartlang-testcase:///recovery_in_elements.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/redirecting_initializers.dart.strong.expect b/pkg/front_end/testcases/enhanced_enums/redirecting_initializers.dart.strong.expect
index 3195885..3f16bc9 100644
--- a/pkg/front_end/testcases/enhanced_enums/redirecting_initializers.dart.strong.expect
+++ b/pkg/front_end/testcases/enhanced_enums/redirecting_initializers.dart.strong.expect

@@ -73,8 +73,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///redirecting_initializers.dart:
 - E1. (from org-dartlang-testcase:///redirecting_initializers.dart:11:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E1.named (from org-dartlang-testcase:///redirecting_initializers.dart:12:9)
 - E2. (from org-dartlang-testcase:///redirecting_initializers.dart:21:9)
 - E2.named (from org-dartlang-testcase:///redirecting_initializers.dart:22:9)

diff --git a/pkg/front_end/testcases/enhanced_enums/redirecting_initializers.dart.strong.transformed.expect b/pkg/front_end/testcases/enhanced_enums/redirecting_initializers.dart.strong.transformed.expect
index 3195885..3f16bc9 100644
--- a/pkg/front_end/testcases/enhanced_enums/redirecting_initializers.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/redirecting_initializers.dart.strong.transformed.expect

@@ -73,8 +73,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///redirecting_initializers.dart:
 - E1. (from org-dartlang-testcase:///redirecting_initializers.dart:11:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E1.named (from org-dartlang-testcase:///redirecting_initializers.dart:12:9)
 - E2. (from org-dartlang-testcase:///redirecting_initializers.dart:21:9)
 - E2.named (from org-dartlang-testcase:///redirecting_initializers.dart:22:9)

diff --git a/pkg/front_end/testcases/enhanced_enums/redirecting_initializers.dart.weak.expect b/pkg/front_end/testcases/enhanced_enums/redirecting_initializers.dart.weak.expect
index f83c50a..3d79c96 100644
--- a/pkg/front_end/testcases/enhanced_enums/redirecting_initializers.dart.weak.expect
+++ b/pkg/front_end/testcases/enhanced_enums/redirecting_initializers.dart.weak.expect

@@ -73,8 +73,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///redirecting_initializers.dart:
 - E1. (from org-dartlang-testcase:///redirecting_initializers.dart:11:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E1.named (from org-dartlang-testcase:///redirecting_initializers.dart:12:9)
 - E2. (from org-dartlang-testcase:///redirecting_initializers.dart:21:9)
 - E2.named (from org-dartlang-testcase:///redirecting_initializers.dart:22:9)

diff --git a/pkg/front_end/testcases/enhanced_enums/redirecting_initializers.dart.weak.modular.expect b/pkg/front_end/testcases/enhanced_enums/redirecting_initializers.dart.weak.modular.expect
index f83c50a..3d79c96 100644
--- a/pkg/front_end/testcases/enhanced_enums/redirecting_initializers.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/enhanced_enums/redirecting_initializers.dart.weak.modular.expect

@@ -73,8 +73,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///redirecting_initializers.dart:
 - E1. (from org-dartlang-testcase:///redirecting_initializers.dart:11:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E1.named (from org-dartlang-testcase:///redirecting_initializers.dart:12:9)
 - E2. (from org-dartlang-testcase:///redirecting_initializers.dart:21:9)
 - E2.named (from org-dartlang-testcase:///redirecting_initializers.dart:22:9)

diff --git a/pkg/front_end/testcases/enhanced_enums/redirecting_initializers.dart.weak.transformed.expect b/pkg/front_end/testcases/enhanced_enums/redirecting_initializers.dart.weak.transformed.expect
index f83c50a..3d79c96 100644
--- a/pkg/front_end/testcases/enhanced_enums/redirecting_initializers.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/redirecting_initializers.dart.weak.transformed.expect

@@ -73,8 +73,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///redirecting_initializers.dart:
 - E1. (from org-dartlang-testcase:///redirecting_initializers.dart:11:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E1.named (from org-dartlang-testcase:///redirecting_initializers.dart:12:9)
 - E2. (from org-dartlang-testcase:///redirecting_initializers.dart:21:9)
 - E2.named (from org-dartlang-testcase:///redirecting_initializers.dart:22:9)

diff --git a/pkg/front_end/testcases/enhanced_enums/setter_getter_type_check.dart.strong.expect b/pkg/front_end/testcases/enhanced_enums/setter_getter_type_check.dart.strong.expect
index e0d5af2..feb19f0 100644
--- a/pkg/front_end/testcases/enhanced_enums/setter_getter_type_check.dart.strong.expect
+++ b/pkg/front_end/testcases/enhanced_enums/setter_getter_type_check.dart.strong.expect

@@ -41,5 +41,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///setter_getter_type_check.dart:
 - E. (from org-dartlang-testcase:///setter_getter_type_check.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/setter_getter_type_check.dart.strong.transformed.expect b/pkg/front_end/testcases/enhanced_enums/setter_getter_type_check.dart.strong.transformed.expect
index e0d5af2..feb19f0 100644
--- a/pkg/front_end/testcases/enhanced_enums/setter_getter_type_check.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/setter_getter_type_check.dart.strong.transformed.expect

@@ -41,5 +41,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///setter_getter_type_check.dart:
 - E. (from org-dartlang-testcase:///setter_getter_type_check.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/setter_getter_type_check.dart.weak.expect b/pkg/front_end/testcases/enhanced_enums/setter_getter_type_check.dart.weak.expect
index d56028e..8c7ca0a 100644
--- a/pkg/front_end/testcases/enhanced_enums/setter_getter_type_check.dart.weak.expect
+++ b/pkg/front_end/testcases/enhanced_enums/setter_getter_type_check.dart.weak.expect

@@ -41,5 +41,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///setter_getter_type_check.dart:
 - E. (from org-dartlang-testcase:///setter_getter_type_check.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/setter_getter_type_check.dart.weak.modular.expect b/pkg/front_end/testcases/enhanced_enums/setter_getter_type_check.dart.weak.modular.expect
index d56028e..8c7ca0a 100644
--- a/pkg/front_end/testcases/enhanced_enums/setter_getter_type_check.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/enhanced_enums/setter_getter_type_check.dart.weak.modular.expect

@@ -41,5 +41,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///setter_getter_type_check.dart:
 - E. (from org-dartlang-testcase:///setter_getter_type_check.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/setter_getter_type_check.dart.weak.transformed.expect b/pkg/front_end/testcases/enhanced_enums/setter_getter_type_check.dart.weak.transformed.expect
index d56028e..8c7ca0a 100644
--- a/pkg/front_end/testcases/enhanced_enums/setter_getter_type_check.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/setter_getter_type_check.dart.weak.transformed.expect

@@ -41,5 +41,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///setter_getter_type_check.dart:
 - E. (from org-dartlang-testcase:///setter_getter_type_check.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/simple_fields.dart.strong.expect b/pkg/front_end/testcases/enhanced_enums/simple_fields.dart.strong.expect
index 8d7b750..862602a 100644
--- a/pkg/front_end/testcases/enhanced_enums/simple_fields.dart.strong.expect
+++ b/pkg/front_end/testcases/enhanced_enums/simple_fields.dart.strong.expect

@@ -54,8 +54,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///simple_fields.dart:
 - E1. (from org-dartlang-testcase:///simple_fields.dart:11:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E1.named (from org-dartlang-testcase:///simple_fields.dart:13:9)
 - E2. (from org-dartlang-testcase:///simple_fields.dart:24:9)
 - E2.named (from org-dartlang-testcase:///simple_fields.dart:25:9)

diff --git a/pkg/front_end/testcases/enhanced_enums/simple_fields.dart.strong.transformed.expect b/pkg/front_end/testcases/enhanced_enums/simple_fields.dart.strong.transformed.expect
index 8d7b750..862602a 100644
--- a/pkg/front_end/testcases/enhanced_enums/simple_fields.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/simple_fields.dart.strong.transformed.expect

@@ -54,8 +54,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///simple_fields.dart:
 - E1. (from org-dartlang-testcase:///simple_fields.dart:11:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E1.named (from org-dartlang-testcase:///simple_fields.dart:13:9)
 - E2. (from org-dartlang-testcase:///simple_fields.dart:24:9)
 - E2.named (from org-dartlang-testcase:///simple_fields.dart:25:9)

diff --git a/pkg/front_end/testcases/enhanced_enums/simple_fields.dart.weak.expect b/pkg/front_end/testcases/enhanced_enums/simple_fields.dart.weak.expect
index c2e56ff..54c0946 100644
--- a/pkg/front_end/testcases/enhanced_enums/simple_fields.dart.weak.expect
+++ b/pkg/front_end/testcases/enhanced_enums/simple_fields.dart.weak.expect

@@ -54,8 +54,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///simple_fields.dart:
 - E1. (from org-dartlang-testcase:///simple_fields.dart:11:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E1.named (from org-dartlang-testcase:///simple_fields.dart:13:9)
 - E2. (from org-dartlang-testcase:///simple_fields.dart:24:9)
 - E2.named (from org-dartlang-testcase:///simple_fields.dart:25:9)

diff --git a/pkg/front_end/testcases/enhanced_enums/simple_fields.dart.weak.modular.expect b/pkg/front_end/testcases/enhanced_enums/simple_fields.dart.weak.modular.expect
index c2e56ff..54c0946 100644
--- a/pkg/front_end/testcases/enhanced_enums/simple_fields.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/enhanced_enums/simple_fields.dart.weak.modular.expect

@@ -54,8 +54,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///simple_fields.dart:
 - E1. (from org-dartlang-testcase:///simple_fields.dart:11:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E1.named (from org-dartlang-testcase:///simple_fields.dart:13:9)
 - E2. (from org-dartlang-testcase:///simple_fields.dart:24:9)
 - E2.named (from org-dartlang-testcase:///simple_fields.dart:25:9)

diff --git a/pkg/front_end/testcases/enhanced_enums/simple_fields.dart.weak.transformed.expect b/pkg/front_end/testcases/enhanced_enums/simple_fields.dart.weak.transformed.expect
index c2e56ff..54c0946 100644
--- a/pkg/front_end/testcases/enhanced_enums/simple_fields.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/simple_fields.dart.weak.transformed.expect

@@ -54,8 +54,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///simple_fields.dart:
 - E1. (from org-dartlang-testcase:///simple_fields.dart:11:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E1.named (from org-dartlang-testcase:///simple_fields.dart:13:9)
 - E2. (from org-dartlang-testcase:///simple_fields.dart:24:9)
 - E2.named (from org-dartlang-testcase:///simple_fields.dart:25:9)

diff --git a/pkg/front_end/testcases/enhanced_enums/simple_interfaces.dart.strong.expect b/pkg/front_end/testcases/enhanced_enums/simple_interfaces.dart.strong.expect
index b5b0c7e..7cecb98 100644
--- a/pkg/front_end/testcases/enhanced_enums/simple_interfaces.dart.strong.expect
+++ b/pkg/front_end/testcases/enhanced_enums/simple_interfaces.dart.strong.expect

@@ -114,8 +114,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///simple_interfaces.dart:
 - E1. (from org-dartlang-testcase:///simple_interfaces.dart:9:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///simple_interfaces.dart:16:6)
 - E3. (from org-dartlang-testcase:///simple_interfaces.dart:21:6)
 - E4. (from org-dartlang-testcase:///simple_interfaces.dart:28:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/simple_interfaces.dart.strong.transformed.expect b/pkg/front_end/testcases/enhanced_enums/simple_interfaces.dart.strong.transformed.expect
index b5b0c7e..7cecb98 100644
--- a/pkg/front_end/testcases/enhanced_enums/simple_interfaces.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/simple_interfaces.dart.strong.transformed.expect

@@ -114,8 +114,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///simple_interfaces.dart:
 - E1. (from org-dartlang-testcase:///simple_interfaces.dart:9:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///simple_interfaces.dart:16:6)
 - E3. (from org-dartlang-testcase:///simple_interfaces.dart:21:6)
 - E4. (from org-dartlang-testcase:///simple_interfaces.dart:28:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/simple_interfaces.dart.weak.expect b/pkg/front_end/testcases/enhanced_enums/simple_interfaces.dart.weak.expect
index 427e319..9b056a7 100644
--- a/pkg/front_end/testcases/enhanced_enums/simple_interfaces.dart.weak.expect
+++ b/pkg/front_end/testcases/enhanced_enums/simple_interfaces.dart.weak.expect

@@ -114,8 +114,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///simple_interfaces.dart:
 - E1. (from org-dartlang-testcase:///simple_interfaces.dart:9:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///simple_interfaces.dart:16:6)
 - E3. (from org-dartlang-testcase:///simple_interfaces.dart:21:6)
 - E4. (from org-dartlang-testcase:///simple_interfaces.dart:28:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/simple_interfaces.dart.weak.modular.expect b/pkg/front_end/testcases/enhanced_enums/simple_interfaces.dart.weak.modular.expect
index 427e319..9b056a7 100644
--- a/pkg/front_end/testcases/enhanced_enums/simple_interfaces.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/enhanced_enums/simple_interfaces.dart.weak.modular.expect

@@ -114,8 +114,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///simple_interfaces.dart:
 - E1. (from org-dartlang-testcase:///simple_interfaces.dart:9:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///simple_interfaces.dart:16:6)
 - E3. (from org-dartlang-testcase:///simple_interfaces.dart:21:6)
 - E4. (from org-dartlang-testcase:///simple_interfaces.dart:28:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/simple_interfaces.dart.weak.transformed.expect b/pkg/front_end/testcases/enhanced_enums/simple_interfaces.dart.weak.transformed.expect
index 427e319..9b056a7 100644
--- a/pkg/front_end/testcases/enhanced_enums/simple_interfaces.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/simple_interfaces.dart.weak.transformed.expect

@@ -114,8 +114,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///simple_interfaces.dart:
 - E1. (from org-dartlang-testcase:///simple_interfaces.dart:9:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///simple_interfaces.dart:16:6)
 - E3. (from org-dartlang-testcase:///simple_interfaces.dart:21:6)
 - E4. (from org-dartlang-testcase:///simple_interfaces.dart:28:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/simple_mixins.dart.strong.expect b/pkg/front_end/testcases/enhanced_enums/simple_mixins.dart.strong.expect
index 9874f5a..d0dd673 100644
--- a/pkg/front_end/testcases/enhanced_enums/simple_mixins.dart.strong.expect
+++ b/pkg/front_end/testcases/enhanced_enums/simple_mixins.dart.strong.expect

@@ -128,8 +128,8 @@
 org-dartlang-testcase:///simple_mixins.dart:
 - E1. (from org-dartlang-testcase:///simple_mixins.dart:19:6)
 - _E1&_Enum&A. (from org-dartlang-testcase:///simple_mixins.dart:19:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///simple_mixins.dart:21:6)
 - _E2&_Enum&A&B. (from org-dartlang-testcase:///simple_mixins.dart:21:6)
 - _E2&_Enum&A. (from org-dartlang-testcase:///simple_mixins.dart:21:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/simple_mixins.dart.strong.transformed.expect b/pkg/front_end/testcases/enhanced_enums/simple_mixins.dart.strong.transformed.expect
index 3d4428c..0a9019f 100644
--- a/pkg/front_end/testcases/enhanced_enums/simple_mixins.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/simple_mixins.dart.strong.transformed.expect

@@ -129,8 +129,8 @@
 org-dartlang-testcase:///simple_mixins.dart:
 - E1. (from org-dartlang-testcase:///simple_mixins.dart:19:6)
 - _E1&_Enum&A. (from org-dartlang-testcase:///simple_mixins.dart:19:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///simple_mixins.dart:21:6)
 - _E2&_Enum&A&B. (from org-dartlang-testcase:///simple_mixins.dart:21:6)
 - _E2&_Enum&A. (from org-dartlang-testcase:///simple_mixins.dart:21:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/simple_mixins.dart.weak.expect b/pkg/front_end/testcases/enhanced_enums/simple_mixins.dart.weak.expect
index 6929e27..90dd93e 100644
--- a/pkg/front_end/testcases/enhanced_enums/simple_mixins.dart.weak.expect
+++ b/pkg/front_end/testcases/enhanced_enums/simple_mixins.dart.weak.expect

@@ -128,8 +128,8 @@
 org-dartlang-testcase:///simple_mixins.dart:
 - E1. (from org-dartlang-testcase:///simple_mixins.dart:19:6)
 - _E1&_Enum&A. (from org-dartlang-testcase:///simple_mixins.dart:19:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///simple_mixins.dart:21:6)
 - _E2&_Enum&A&B. (from org-dartlang-testcase:///simple_mixins.dart:21:6)
 - _E2&_Enum&A. (from org-dartlang-testcase:///simple_mixins.dart:21:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/simple_mixins.dart.weak.modular.expect b/pkg/front_end/testcases/enhanced_enums/simple_mixins.dart.weak.modular.expect
index 6929e27..90dd93e 100644
--- a/pkg/front_end/testcases/enhanced_enums/simple_mixins.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/enhanced_enums/simple_mixins.dart.weak.modular.expect

@@ -128,8 +128,8 @@
 org-dartlang-testcase:///simple_mixins.dart:
 - E1. (from org-dartlang-testcase:///simple_mixins.dart:19:6)
 - _E1&_Enum&A. (from org-dartlang-testcase:///simple_mixins.dart:19:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///simple_mixins.dart:21:6)
 - _E2&_Enum&A&B. (from org-dartlang-testcase:///simple_mixins.dart:21:6)
 - _E2&_Enum&A. (from org-dartlang-testcase:///simple_mixins.dart:21:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/simple_mixins.dart.weak.transformed.expect b/pkg/front_end/testcases/enhanced_enums/simple_mixins.dart.weak.transformed.expect
index df7c1ae..add9169 100644
--- a/pkg/front_end/testcases/enhanced_enums/simple_mixins.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/simple_mixins.dart.weak.transformed.expect

@@ -129,8 +129,8 @@
 org-dartlang-testcase:///simple_mixins.dart:
 - E1. (from org-dartlang-testcase:///simple_mixins.dart:19:6)
 - _E1&_Enum&A. (from org-dartlang-testcase:///simple_mixins.dart:19:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///simple_mixins.dart:21:6)
 - _E2&_Enum&A&B. (from org-dartlang-testcase:///simple_mixins.dart:21:6)
 - _E2&_Enum&A. (from org-dartlang-testcase:///simple_mixins.dart:21:6)

diff --git a/pkg/front_end/testcases/enhanced_enums/supertype_resolved_before_checking.dart.strong.expect b/pkg/front_end/testcases/enhanced_enums/supertype_resolved_before_checking.dart.strong.expect
index 29c7b15..ed75ea0 100644
--- a/pkg/front_end/testcases/enhanced_enums/supertype_resolved_before_checking.dart.strong.expect
+++ b/pkg/front_end/testcases/enhanced_enums/supertype_resolved_before_checking.dart.strong.expect

@@ -50,5 +50,5 @@
 - E. (from org-dartlang-testcase:///supertype_resolved_before_checking.dart:16:6)
 - _E&_Enum&GM&M. (from org-dartlang-testcase:///supertype_resolved_before_checking.dart:16:6)
 - _E&_Enum&GM. (from org-dartlang-testcase:///supertype_resolved_before_checking.dart:16:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/supertype_resolved_before_checking.dart.strong.transformed.expect b/pkg/front_end/testcases/enhanced_enums/supertype_resolved_before_checking.dart.strong.transformed.expect
index 937ba86..0a1d68f 100644
--- a/pkg/front_end/testcases/enhanced_enums/supertype_resolved_before_checking.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/supertype_resolved_before_checking.dart.strong.transformed.expect

@@ -50,5 +50,5 @@
 - E. (from org-dartlang-testcase:///supertype_resolved_before_checking.dart:16:6)
 - _E&_Enum&GM&M. (from org-dartlang-testcase:///supertype_resolved_before_checking.dart:16:6)
 - _E&_Enum&GM. (from org-dartlang-testcase:///supertype_resolved_before_checking.dart:16:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/supertype_resolved_before_checking.dart.weak.expect b/pkg/front_end/testcases/enhanced_enums/supertype_resolved_before_checking.dart.weak.expect
index a4248f3..8debe55 100644
--- a/pkg/front_end/testcases/enhanced_enums/supertype_resolved_before_checking.dart.weak.expect
+++ b/pkg/front_end/testcases/enhanced_enums/supertype_resolved_before_checking.dart.weak.expect

@@ -50,5 +50,5 @@
 - E. (from org-dartlang-testcase:///supertype_resolved_before_checking.dart:16:6)
 - _E&_Enum&GM&M. (from org-dartlang-testcase:///supertype_resolved_before_checking.dart:16:6)
 - _E&_Enum&GM. (from org-dartlang-testcase:///supertype_resolved_before_checking.dart:16:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/supertype_resolved_before_checking.dart.weak.modular.expect b/pkg/front_end/testcases/enhanced_enums/supertype_resolved_before_checking.dart.weak.modular.expect
index a4248f3..8debe55 100644
--- a/pkg/front_end/testcases/enhanced_enums/supertype_resolved_before_checking.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/enhanced_enums/supertype_resolved_before_checking.dart.weak.modular.expect

@@ -50,5 +50,5 @@
 - E. (from org-dartlang-testcase:///supertype_resolved_before_checking.dart:16:6)
 - _E&_Enum&GM&M. (from org-dartlang-testcase:///supertype_resolved_before_checking.dart:16:6)
 - _E&_Enum&GM. (from org-dartlang-testcase:///supertype_resolved_before_checking.dart:16:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/enhanced_enums/supertype_resolved_before_checking.dart.weak.transformed.expect b/pkg/front_end/testcases/enhanced_enums/supertype_resolved_before_checking.dart.weak.transformed.expect
index ef21642..4bd7d53 100644
--- a/pkg/front_end/testcases/enhanced_enums/supertype_resolved_before_checking.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/enhanced_enums/supertype_resolved_before_checking.dart.weak.transformed.expect

@@ -50,5 +50,5 @@
 - E. (from org-dartlang-testcase:///supertype_resolved_before_checking.dart:16:6)
 - _E&_Enum&GM&M. (from org-dartlang-testcase:///supertype_resolved_before_checking.dart:16:6)
 - _E&_Enum&GM. (from org-dartlang-testcase:///supertype_resolved_before_checking.dart:16:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/extensions/annotations.dart.weak.expect b/pkg/front_end/testcases/extensions/annotations.dart.weak.expect
index 665bd67..c30c30f 100644
--- a/pkg/front_end/testcases/extensions/annotations.dart.weak.expect
+++ b/pkg/front_end/testcases/extensions/annotations.dart.weak.expect

@@ -35,5 +35,5 @@
 
 Constructor coverage from constants:
 org-dartlang-testcase:///annotations.dart:
-- pragma._ (from org-dartlang-sdk:///sdk/lib/core/annotations.dart:188:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- pragma._ (from org-dartlang-sdk:///sdk/lib/core/annotations.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/extensions/annotations.dart.weak.modular.expect b/pkg/front_end/testcases/extensions/annotations.dart.weak.modular.expect
index 665bd67..c30c30f 100644
--- a/pkg/front_end/testcases/extensions/annotations.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/extensions/annotations.dart.weak.modular.expect

@@ -35,5 +35,5 @@
 
 Constructor coverage from constants:
 org-dartlang-testcase:///annotations.dart:
-- pragma._ (from org-dartlang-sdk:///sdk/lib/core/annotations.dart:188:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- pragma._ (from org-dartlang-sdk:///sdk/lib/core/annotations.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/extensions/annotations.dart.weak.transformed.expect b/pkg/front_end/testcases/extensions/annotations.dart.weak.transformed.expect
index 665bd67..c30c30f 100644
--- a/pkg/front_end/testcases/extensions/annotations.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/extensions/annotations.dart.weak.transformed.expect

@@ -35,5 +35,5 @@
 
 Constructor coverage from constants:
 org-dartlang-testcase:///annotations.dart:
-- pragma._ (from org-dartlang-sdk:///sdk/lib/core/annotations.dart:188:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- pragma._ (from org-dartlang-sdk:///sdk/lib/core/annotations.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/DeltaBlue.dart.weak.expect b/pkg/front_end/testcases/general/DeltaBlue.dart.weak.expect
index 461b238..e4b2044 100644
--- a/pkg/front_end/testcases/general/DeltaBlue.dart.weak.expect
+++ b/pkg/front_end/testcases/general/DeltaBlue.dart.weak.expect

@@ -478,4 +478,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///DeltaBlue.dart:
 - Strength. (from org-dartlang-testcase:///DeltaBlue.dart:59:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/DeltaBlue.dart.weak.modular.expect b/pkg/front_end/testcases/general/DeltaBlue.dart.weak.modular.expect
index 461b238..e4b2044 100644
--- a/pkg/front_end/testcases/general/DeltaBlue.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/DeltaBlue.dart.weak.modular.expect

@@ -478,4 +478,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///DeltaBlue.dart:
 - Strength. (from org-dartlang-testcase:///DeltaBlue.dart:59:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/DeltaBlue.dart.weak.transformed.expect b/pkg/front_end/testcases/general/DeltaBlue.dart.weak.transformed.expect
index 67cdcf7..d3be75c 100644
--- a/pkg/front_end/testcases/general/DeltaBlue.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/DeltaBlue.dart.weak.transformed.expect

@@ -478,4 +478,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///DeltaBlue.dart:
 - Strength. (from org-dartlang-testcase:///DeltaBlue.dart:59:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/annotation_on_enum_values.dart.weak.expect b/pkg/front_end/testcases/general/annotation_on_enum_values.dart.weak.expect
index a32b8d5..c95f304 100644
--- a/pkg/front_end/testcases/general/annotation_on_enum_values.dart.weak.expect
+++ b/pkg/front_end/testcases/general/annotation_on_enum_values.dart.weak.expect

@@ -43,6 +43,6 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///annotation_on_enum_values.dart:
 - Foo. (from org-dartlang-testcase:///annotation_on_enum_values.dart:15:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Fisk.fisk (from org-dartlang-testcase:///annotation_on_enum_values.dart:12:9)

diff --git a/pkg/front_end/testcases/general/annotation_on_enum_values.dart.weak.modular.expect b/pkg/front_end/testcases/general/annotation_on_enum_values.dart.weak.modular.expect
index a32b8d5..c95f304 100644
--- a/pkg/front_end/testcases/general/annotation_on_enum_values.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/annotation_on_enum_values.dart.weak.modular.expect

@@ -43,6 +43,6 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///annotation_on_enum_values.dart:
 - Foo. (from org-dartlang-testcase:///annotation_on_enum_values.dart:15:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Fisk.fisk (from org-dartlang-testcase:///annotation_on_enum_values.dart:12:9)

diff --git a/pkg/front_end/testcases/general/annotation_on_enum_values.dart.weak.transformed.expect b/pkg/front_end/testcases/general/annotation_on_enum_values.dart.weak.transformed.expect
index a32b8d5..c95f304 100644
--- a/pkg/front_end/testcases/general/annotation_on_enum_values.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/annotation_on_enum_values.dart.weak.transformed.expect

@@ -43,6 +43,6 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///annotation_on_enum_values.dart:
 - Foo. (from org-dartlang-testcase:///annotation_on_enum_values.dart:15:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Fisk.fisk (from org-dartlang-testcase:///annotation_on_enum_values.dart:12:9)

diff --git a/pkg/front_end/testcases/general/annotation_top.dart.weak.expect b/pkg/front_end/testcases/general/annotation_top.dart.weak.expect
index c2da223..ae94164 100644
--- a/pkg/front_end/testcases/general/annotation_top.dart.weak.expect
+++ b/pkg/front_end/testcases/general/annotation_top.dart.weak.expect

@@ -41,5 +41,5 @@
 
 Constructor coverage from constants:
 org-dartlang-testcase:///annotation_top.dart:
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - A. (from org-dartlang-testcase:///annotation_top.dart:12:9)

diff --git a/pkg/front_end/testcases/general/annotation_top.dart.weak.modular.expect b/pkg/front_end/testcases/general/annotation_top.dart.weak.modular.expect
index c2da223..ae94164 100644
--- a/pkg/front_end/testcases/general/annotation_top.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/annotation_top.dart.weak.modular.expect

@@ -41,5 +41,5 @@
 
 Constructor coverage from constants:
 org-dartlang-testcase:///annotation_top.dart:
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - A. (from org-dartlang-testcase:///annotation_top.dart:12:9)

diff --git a/pkg/front_end/testcases/general/annotation_top.dart.weak.transformed.expect b/pkg/front_end/testcases/general/annotation_top.dart.weak.transformed.expect
index c2da223..ae94164 100644
--- a/pkg/front_end/testcases/general/annotation_top.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/annotation_top.dart.weak.transformed.expect

@@ -41,5 +41,5 @@
 
 Constructor coverage from constants:
 org-dartlang-testcase:///annotation_top.dart:
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - A. (from org-dartlang-testcase:///annotation_top.dart:12:9)

diff --git a/pkg/front_end/testcases/general/annotation_variable_declaration.dart.weak.expect b/pkg/front_end/testcases/general/annotation_variable_declaration.dart.weak.expect
index 8329d57..84a4642 100644
--- a/pkg/front_end/testcases/general/annotation_variable_declaration.dart.weak.expect
+++ b/pkg/front_end/testcases/general/annotation_variable_declaration.dart.weak.expect

@@ -45,5 +45,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///annotation_variable_declaration.dart:
 - Bar. (from org-dartlang-testcase:///annotation_variable_declaration.dart:8:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Bar.named (from org-dartlang-testcase:///annotation_variable_declaration.dart:9:9)

diff --git a/pkg/front_end/testcases/general/annotation_variable_declaration.dart.weak.modular.expect b/pkg/front_end/testcases/general/annotation_variable_declaration.dart.weak.modular.expect
index 8329d57..84a4642 100644
--- a/pkg/front_end/testcases/general/annotation_variable_declaration.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/annotation_variable_declaration.dart.weak.modular.expect

@@ -45,5 +45,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///annotation_variable_declaration.dart:
 - Bar. (from org-dartlang-testcase:///annotation_variable_declaration.dart:8:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Bar.named (from org-dartlang-testcase:///annotation_variable_declaration.dart:9:9)

diff --git a/pkg/front_end/testcases/general/annotation_variable_declaration.dart.weak.transformed.expect b/pkg/front_end/testcases/general/annotation_variable_declaration.dart.weak.transformed.expect
index 8329d57..84a4642 100644
--- a/pkg/front_end/testcases/general/annotation_variable_declaration.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/annotation_variable_declaration.dart.weak.transformed.expect

@@ -45,5 +45,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///annotation_variable_declaration.dart:
 - Bar. (from org-dartlang-testcase:///annotation_variable_declaration.dart:8:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Bar.named (from org-dartlang-testcase:///annotation_variable_declaration.dart:9:9)

diff --git a/pkg/front_end/testcases/general/bounds_enums.dart.weak.expect b/pkg/front_end/testcases/general/bounds_enums.dart.weak.expect
index b11dd0c..d51a580 100644
--- a/pkg/front_end/testcases/general/bounds_enums.dart.weak.expect
+++ b/pkg/front_end/testcases/general/bounds_enums.dart.weak.expect

@@ -69,7 +69,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///bounds_enums.dart:
 - E1. (from org-dartlang-testcase:///bounds_enums.dart:11:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///bounds_enums.dart:15:6)
 - E3. (from org-dartlang-testcase:///bounds_enums.dart:19:6)

diff --git a/pkg/front_end/testcases/general/bounds_enums.dart.weak.modular.expect b/pkg/front_end/testcases/general/bounds_enums.dart.weak.modular.expect
index b11dd0c..d51a580 100644
--- a/pkg/front_end/testcases/general/bounds_enums.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/bounds_enums.dart.weak.modular.expect

@@ -69,7 +69,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///bounds_enums.dart:
 - E1. (from org-dartlang-testcase:///bounds_enums.dart:11:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///bounds_enums.dart:15:6)
 - E3. (from org-dartlang-testcase:///bounds_enums.dart:19:6)

diff --git a/pkg/front_end/testcases/general/bounds_enums.dart.weak.transformed.expect b/pkg/front_end/testcases/general/bounds_enums.dart.weak.transformed.expect
index b11dd0c..d51a580 100644
--- a/pkg/front_end/testcases/general/bounds_enums.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/bounds_enums.dart.weak.transformed.expect

@@ -69,7 +69,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///bounds_enums.dart:
 - E1. (from org-dartlang-testcase:///bounds_enums.dart:11:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E2. (from org-dartlang-testcase:///bounds_enums.dart:15:6)
 - E3. (from org-dartlang-testcase:///bounds_enums.dart:19:6)

diff --git a/pkg/front_end/testcases/general/bounds_supertypes.dart.weak.expect b/pkg/front_end/testcases/general/bounds_supertypes.dart.weak.expect
index f442996..e6bd8d9 100644
--- a/pkg/front_end/testcases/general/bounds_supertypes.dart.weak.expect
+++ b/pkg/front_end/testcases/general/bounds_supertypes.dart.weak.expect

@@ -1548,8 +1548,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///bounds_supertypes.dart:
 - EnumImplementsT1. (from org-dartlang-testcase:///bounds_supertypes.dart:109:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - EnumImplementsT2. (from org-dartlang-testcase:///bounds_supertypes.dart:111:6)
 - EnumImplementsT3. (from org-dartlang-testcase:///bounds_supertypes.dart:113:6)
 - EnumImplementsT4. (from org-dartlang-testcase:///bounds_supertypes.dart:115:6)

diff --git a/pkg/front_end/testcases/general/bounds_supertypes.dart.weak.modular.expect b/pkg/front_end/testcases/general/bounds_supertypes.dart.weak.modular.expect
index f442996..e6bd8d9 100644
--- a/pkg/front_end/testcases/general/bounds_supertypes.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/bounds_supertypes.dart.weak.modular.expect

@@ -1548,8 +1548,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///bounds_supertypes.dart:
 - EnumImplementsT1. (from org-dartlang-testcase:///bounds_supertypes.dart:109:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - EnumImplementsT2. (from org-dartlang-testcase:///bounds_supertypes.dart:111:6)
 - EnumImplementsT3. (from org-dartlang-testcase:///bounds_supertypes.dart:113:6)
 - EnumImplementsT4. (from org-dartlang-testcase:///bounds_supertypes.dart:115:6)

diff --git a/pkg/front_end/testcases/general/bounds_supertypes.dart.weak.transformed.expect b/pkg/front_end/testcases/general/bounds_supertypes.dart.weak.transformed.expect
index 9a3338a..a8c3d87 100644
--- a/pkg/front_end/testcases/general/bounds_supertypes.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/bounds_supertypes.dart.weak.transformed.expect

@@ -1548,8 +1548,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///bounds_supertypes.dart:
 - EnumImplementsT1. (from org-dartlang-testcase:///bounds_supertypes.dart:109:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - EnumImplementsT2. (from org-dartlang-testcase:///bounds_supertypes.dart:111:6)
 - EnumImplementsT3. (from org-dartlang-testcase:///bounds_supertypes.dart:113:6)
 - EnumImplementsT4. (from org-dartlang-testcase:///bounds_supertypes.dart:115:6)

diff --git a/pkg/front_end/testcases/general/bounds_type_parameters.dart.weak.expect b/pkg/front_end/testcases/general/bounds_type_parameters.dart.weak.expect
index cc9a69c..08eda2c 100644
--- a/pkg/front_end/testcases/general/bounds_type_parameters.dart.weak.expect
+++ b/pkg/front_end/testcases/general/bounds_type_parameters.dart.weak.expect

@@ -630,5 +630,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///bounds_type_parameters.dart:
 - Enum1. (from org-dartlang-testcase:///bounds_type_parameters.dart:129:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/bounds_type_parameters.dart.weak.modular.expect b/pkg/front_end/testcases/general/bounds_type_parameters.dart.weak.modular.expect
index cc9a69c..08eda2c 100644
--- a/pkg/front_end/testcases/general/bounds_type_parameters.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/bounds_type_parameters.dart.weak.modular.expect

@@ -630,5 +630,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///bounds_type_parameters.dart:
 - Enum1. (from org-dartlang-testcase:///bounds_type_parameters.dart:129:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/bounds_type_parameters.dart.weak.transformed.expect b/pkg/front_end/testcases/general/bounds_type_parameters.dart.weak.transformed.expect
index ae5b99f..dc602de 100644
--- a/pkg/front_end/testcases/general/bounds_type_parameters.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/bounds_type_parameters.dart.weak.transformed.expect

@@ -630,5 +630,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///bounds_type_parameters.dart:
 - Enum1. (from org-dartlang-testcase:///bounds_type_parameters.dart:129:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/bug33099.dart.weak.expect b/pkg/front_end/testcases/general/bug33099.dart.weak.expect
index 8f57112..c3ea8e6 100644
--- a/pkg/front_end/testcases/general/bug33099.dart.weak.expect
+++ b/pkg/front_end/testcases/general/bug33099.dart.weak.expect

@@ -60,4 +60,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///bug33099.dart:
 - _FailingTest. (from org-dartlang-testcase:///bug33099.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/bug33099.dart.weak.modular.expect b/pkg/front_end/testcases/general/bug33099.dart.weak.modular.expect
index 8f57112..c3ea8e6 100644
--- a/pkg/front_end/testcases/general/bug33099.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/bug33099.dart.weak.modular.expect

@@ -60,4 +60,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///bug33099.dart:
 - _FailingTest. (from org-dartlang-testcase:///bug33099.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/bug33099.dart.weak.transformed.expect b/pkg/front_end/testcases/general/bug33099.dart.weak.transformed.expect
index 854eca8..b6141de 100644
--- a/pkg/front_end/testcases/general/bug33099.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/bug33099.dart.weak.transformed.expect

@@ -60,4 +60,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///bug33099.dart:
 - _FailingTest. (from org-dartlang-testcase:///bug33099.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/constants/circularity.dart.weak.expect b/pkg/front_end/testcases/general/constants/circularity.dart.weak.expect
index f1a8d15..8bf45f3 100644
--- a/pkg/front_end/testcases/general/constants/circularity.dart.weak.expect
+++ b/pkg/front_end/testcases/general/constants/circularity.dart.weak.expect

@@ -97,7 +97,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///circularity.dart:
 - Class1. (from org-dartlang-testcase:///circularity.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Class2. (from org-dartlang-testcase:///circularity.dart:21:9)
 - Class3. (from org-dartlang-testcase:///circularity.dart:29:9)
 - Class4. (from org-dartlang-testcase:///circularity.dart:37:9)

diff --git a/pkg/front_end/testcases/general/constants/circularity.dart.weak.modular.expect b/pkg/front_end/testcases/general/constants/circularity.dart.weak.modular.expect
index f1a8d15..8bf45f3 100644
--- a/pkg/front_end/testcases/general/constants/circularity.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/constants/circularity.dart.weak.modular.expect

@@ -97,7 +97,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///circularity.dart:
 - Class1. (from org-dartlang-testcase:///circularity.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Class2. (from org-dartlang-testcase:///circularity.dart:21:9)
 - Class3. (from org-dartlang-testcase:///circularity.dart:29:9)
 - Class4. (from org-dartlang-testcase:///circularity.dart:37:9)

diff --git a/pkg/front_end/testcases/general/constants/circularity.dart.weak.transformed.expect b/pkg/front_end/testcases/general/constants/circularity.dart.weak.transformed.expect
index f1a8d15..8bf45f3 100644
--- a/pkg/front_end/testcases/general/constants/circularity.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/constants/circularity.dart.weak.transformed.expect

@@ -97,7 +97,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///circularity.dart:
 - Class1. (from org-dartlang-testcase:///circularity.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Class2. (from org-dartlang-testcase:///circularity.dart:21:9)
 - Class3. (from org-dartlang-testcase:///circularity.dart:29:9)
 - Class4. (from org-dartlang-testcase:///circularity.dart:37:9)

diff --git a/pkg/front_end/testcases/general/constants/const_asserts.dart.weak.expect b/pkg/front_end/testcases/general/constants/const_asserts.dart.weak.expect
index 3dc34e4..b1315e5 100644
--- a/pkg/front_end/testcases/general/constants/const_asserts.dart.weak.expect
+++ b/pkg/front_end/testcases/general/constants/const_asserts.dart.weak.expect

@@ -209,7 +209,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_asserts.dart:
 - Foo. (from org-dartlang-testcase:///const_asserts.dart:9:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Foo.withMessage (from org-dartlang-testcase:///const_asserts.dart:16:9)
 - Foo.withInvalidMessage (from org-dartlang-testcase:///const_asserts.dart:18:9)
 - Foo.withInvalidCondition (from org-dartlang-testcase:///const_asserts.dart:19:9)

diff --git a/pkg/front_end/testcases/general/constants/const_asserts.dart.weak.modular.expect b/pkg/front_end/testcases/general/constants/const_asserts.dart.weak.modular.expect
index 3dc34e4..b1315e5 100644
--- a/pkg/front_end/testcases/general/constants/const_asserts.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/constants/const_asserts.dart.weak.modular.expect

@@ -209,7 +209,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_asserts.dart:
 - Foo. (from org-dartlang-testcase:///const_asserts.dart:9:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Foo.withMessage (from org-dartlang-testcase:///const_asserts.dart:16:9)
 - Foo.withInvalidMessage (from org-dartlang-testcase:///const_asserts.dart:18:9)
 - Foo.withInvalidCondition (from org-dartlang-testcase:///const_asserts.dart:19:9)

diff --git a/pkg/front_end/testcases/general/constants/const_asserts.dart.weak.transformed.expect b/pkg/front_end/testcases/general/constants/const_asserts.dart.weak.transformed.expect
index 53ea857..7e408b2 100644
--- a/pkg/front_end/testcases/general/constants/const_asserts.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/constants/const_asserts.dart.weak.transformed.expect

@@ -216,7 +216,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_asserts.dart:
 - Foo. (from org-dartlang-testcase:///const_asserts.dart:9:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Foo.withMessage (from org-dartlang-testcase:///const_asserts.dart:16:9)
 - Foo.withInvalidMessage (from org-dartlang-testcase:///const_asserts.dart:18:9)
 - Foo.withInvalidCondition (from org-dartlang-testcase:///const_asserts.dart:19:9)

diff --git a/pkg/front_end/testcases/general/constants/const_asserts2.dart.weak.expect b/pkg/front_end/testcases/general/constants/const_asserts2.dart.weak.expect
index ac685f3..64c0935 100644
--- a/pkg/front_end/testcases/general/constants/const_asserts2.dart.weak.expect
+++ b/pkg/front_end/testcases/general/constants/const_asserts2.dart.weak.expect

@@ -155,7 +155,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_asserts2.dart:
 - Foo. (from org-dartlang-testcase:///const_asserts2.dart:7:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Foo.withMessage (from org-dartlang-testcase:///const_asserts2.dart:14:9)
 - Foo.withInvalidMessage (from org-dartlang-testcase:///const_asserts2.dart:16:9)
 - Foo.withInvalidCondition (from org-dartlang-testcase:///const_asserts2.dart:17:9)

diff --git a/pkg/front_end/testcases/general/constants/const_asserts2.dart.weak.modular.expect b/pkg/front_end/testcases/general/constants/const_asserts2.dart.weak.modular.expect
index ac685f3..64c0935 100644
--- a/pkg/front_end/testcases/general/constants/const_asserts2.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/constants/const_asserts2.dart.weak.modular.expect

@@ -155,7 +155,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_asserts2.dart:
 - Foo. (from org-dartlang-testcase:///const_asserts2.dart:7:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Foo.withMessage (from org-dartlang-testcase:///const_asserts2.dart:14:9)
 - Foo.withInvalidMessage (from org-dartlang-testcase:///const_asserts2.dart:16:9)
 - Foo.withInvalidCondition (from org-dartlang-testcase:///const_asserts2.dart:17:9)

diff --git a/pkg/front_end/testcases/general/constants/const_asserts2.dart.weak.transformed.expect b/pkg/front_end/testcases/general/constants/const_asserts2.dart.weak.transformed.expect
index 6e172f0..0a67227 100644
--- a/pkg/front_end/testcases/general/constants/const_asserts2.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/constants/const_asserts2.dart.weak.transformed.expect

@@ -162,7 +162,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_asserts2.dart:
 - Foo. (from org-dartlang-testcase:///const_asserts2.dart:7:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Foo.withMessage (from org-dartlang-testcase:///const_asserts2.dart:14:9)
 - Foo.withInvalidMessage (from org-dartlang-testcase:///const_asserts2.dart:16:9)
 - Foo.withInvalidCondition (from org-dartlang-testcase:///const_asserts2.dart:17:9)

diff --git a/pkg/front_end/testcases/general/constants/const_collections.dart.weak.expect b/pkg/front_end/testcases/general/constants/const_collections.dart.weak.expect
index 5043c10..7c9baab 100644
--- a/pkg/front_end/testcases/general/constants/const_collections.dart.weak.expect
+++ b/pkg/front_end/testcases/general/constants/const_collections.dart.weak.expect

@@ -383,8 +383,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_collections.dart:
 - CustomIterable. (from org-dartlang-testcase:///const_collections.dart:79:9)
-- IterableBase. (from org-dartlang-sdk:///sdk/lib/collection/iterable.dart:219:9)
-- Iterable. (from org-dartlang-sdk:///sdk/lib/core/iterable.dart:87:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- IterableBase. (from org-dartlang-sdk:///sdk/lib/collection/iterable.dart)
+- Iterable. (from org-dartlang-sdk:///sdk/lib/core/iterable.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - WithEquals. (from org-dartlang-testcase:///const_collections.dart:72:9)
 - CustomMap. (from org-dartlang-testcase:///const_collections.dart:84:9)

diff --git a/pkg/front_end/testcases/general/constants/const_collections.dart.weak.modular.expect b/pkg/front_end/testcases/general/constants/const_collections.dart.weak.modular.expect
index 5043c10..7c9baab 100644
--- a/pkg/front_end/testcases/general/constants/const_collections.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/constants/const_collections.dart.weak.modular.expect

@@ -383,8 +383,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_collections.dart:
 - CustomIterable. (from org-dartlang-testcase:///const_collections.dart:79:9)
-- IterableBase. (from org-dartlang-sdk:///sdk/lib/collection/iterable.dart:219:9)
-- Iterable. (from org-dartlang-sdk:///sdk/lib/core/iterable.dart:87:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- IterableBase. (from org-dartlang-sdk:///sdk/lib/collection/iterable.dart)
+- Iterable. (from org-dartlang-sdk:///sdk/lib/core/iterable.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - WithEquals. (from org-dartlang-testcase:///const_collections.dart:72:9)
 - CustomMap. (from org-dartlang-testcase:///const_collections.dart:84:9)

diff --git a/pkg/front_end/testcases/general/constants/const_collections.dart.weak.transformed.expect b/pkg/front_end/testcases/general/constants/const_collections.dart.weak.transformed.expect
index 905ec6e..2b18bc2 100644
--- a/pkg/front_end/testcases/general/constants/const_collections.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/constants/const_collections.dart.weak.transformed.expect

@@ -383,8 +383,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_collections.dart:
 - CustomIterable. (from org-dartlang-testcase:///const_collections.dart:79:9)
-- IterableBase. (from org-dartlang-sdk:///sdk/lib/collection/iterable.dart:219:9)
-- Iterable. (from org-dartlang-sdk:///sdk/lib/core/iterable.dart:87:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- IterableBase. (from org-dartlang-sdk:///sdk/lib/collection/iterable.dart)
+- Iterable. (from org-dartlang-sdk:///sdk/lib/core/iterable.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - WithEquals. (from org-dartlang-testcase:///const_collections.dart:72:9)
 - CustomMap. (from org-dartlang-testcase:///const_collections.dart:84:9)

diff --git a/pkg/front_end/testcases/general/constants/const_constructor_coverage.dart.weak.expect b/pkg/front_end/testcases/general/constants/const_constructor_coverage.dart.weak.expect
index a3db761..cb09bbc 100644
--- a/pkg/front_end/testcases/general/constants/const_constructor_coverage.dart.weak.expect
+++ b/pkg/front_end/testcases/general/constants/const_constructor_coverage.dart.weak.expect

@@ -102,7 +102,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_constructor_coverage.dart:
 - Foo. (from org-dartlang-testcase:///const_constructor_coverage_lib1.dart:9:15)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Foo.named1 (from org-dartlang-testcase:///const_constructor_coverage_lib1.dart:10:15)
 - Foo.named2 (from org-dartlang-testcase:///const_constructor_coverage_lib1.dart:11:15)
 - Foo.named3 (from org-dartlang-testcase:///const_constructor_coverage_lib1.dart:12:15)
@@ -110,7 +110,7 @@
 org-dartlang-testcase:///const_constructor_coverage_lib1.dart:
 - Bar. (from org-dartlang-testcase:///const_constructor_coverage_lib1.dart:17:15)
 - Baz. (from org-dartlang-testcase:///const_constructor_coverage_lib2.dart:9:15)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Bar.named1 (from org-dartlang-testcase:///const_constructor_coverage_lib1.dart:18:15)
 - Baz.named1 (from org-dartlang-testcase:///const_constructor_coverage_lib2.dart:10:15)
 - Baz.named5 (from org-dartlang-testcase:///const_constructor_coverage_lib2.dart:14:15)
@@ -119,7 +119,7 @@
 
 org-dartlang-testcase:///const_constructor_coverage_lib2.dart:
 - Bar.named3 (from org-dartlang-testcase:///const_constructor_coverage_lib1.dart:20:15)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Baz.named4 (from org-dartlang-testcase:///const_constructor_coverage_lib2.dart:13:15)
 - Foo.named2 (from org-dartlang-testcase:///const_constructor_coverage_lib1.dart:11:15)
 - Bar.named2 (from org-dartlang-testcase:///const_constructor_coverage_lib1.dart:19:15)

diff --git a/pkg/front_end/testcases/general/constants/const_constructor_coverage.dart.weak.modular.expect b/pkg/front_end/testcases/general/constants/const_constructor_coverage.dart.weak.modular.expect
index a3db761..cb09bbc 100644
--- a/pkg/front_end/testcases/general/constants/const_constructor_coverage.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/constants/const_constructor_coverage.dart.weak.modular.expect

@@ -102,7 +102,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_constructor_coverage.dart:
 - Foo. (from org-dartlang-testcase:///const_constructor_coverage_lib1.dart:9:15)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Foo.named1 (from org-dartlang-testcase:///const_constructor_coverage_lib1.dart:10:15)
 - Foo.named2 (from org-dartlang-testcase:///const_constructor_coverage_lib1.dart:11:15)
 - Foo.named3 (from org-dartlang-testcase:///const_constructor_coverage_lib1.dart:12:15)
@@ -110,7 +110,7 @@
 org-dartlang-testcase:///const_constructor_coverage_lib1.dart:
 - Bar. (from org-dartlang-testcase:///const_constructor_coverage_lib1.dart:17:15)
 - Baz. (from org-dartlang-testcase:///const_constructor_coverage_lib2.dart:9:15)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Bar.named1 (from org-dartlang-testcase:///const_constructor_coverage_lib1.dart:18:15)
 - Baz.named1 (from org-dartlang-testcase:///const_constructor_coverage_lib2.dart:10:15)
 - Baz.named5 (from org-dartlang-testcase:///const_constructor_coverage_lib2.dart:14:15)
@@ -119,7 +119,7 @@
 
 org-dartlang-testcase:///const_constructor_coverage_lib2.dart:
 - Bar.named3 (from org-dartlang-testcase:///const_constructor_coverage_lib1.dart:20:15)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Baz.named4 (from org-dartlang-testcase:///const_constructor_coverage_lib2.dart:13:15)
 - Foo.named2 (from org-dartlang-testcase:///const_constructor_coverage_lib1.dart:11:15)
 - Bar.named2 (from org-dartlang-testcase:///const_constructor_coverage_lib1.dart:19:15)

diff --git a/pkg/front_end/testcases/general/constants/const_constructor_coverage.dart.weak.transformed.expect b/pkg/front_end/testcases/general/constants/const_constructor_coverage.dart.weak.transformed.expect
index a3db761..cb09bbc 100644
--- a/pkg/front_end/testcases/general/constants/const_constructor_coverage.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/constants/const_constructor_coverage.dart.weak.transformed.expect

@@ -102,7 +102,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_constructor_coverage.dart:
 - Foo. (from org-dartlang-testcase:///const_constructor_coverage_lib1.dart:9:15)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Foo.named1 (from org-dartlang-testcase:///const_constructor_coverage_lib1.dart:10:15)
 - Foo.named2 (from org-dartlang-testcase:///const_constructor_coverage_lib1.dart:11:15)
 - Foo.named3 (from org-dartlang-testcase:///const_constructor_coverage_lib1.dart:12:15)
@@ -110,7 +110,7 @@
 org-dartlang-testcase:///const_constructor_coverage_lib1.dart:
 - Bar. (from org-dartlang-testcase:///const_constructor_coverage_lib1.dart:17:15)
 - Baz. (from org-dartlang-testcase:///const_constructor_coverage_lib2.dart:9:15)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Bar.named1 (from org-dartlang-testcase:///const_constructor_coverage_lib1.dart:18:15)
 - Baz.named1 (from org-dartlang-testcase:///const_constructor_coverage_lib2.dart:10:15)
 - Baz.named5 (from org-dartlang-testcase:///const_constructor_coverage_lib2.dart:14:15)
@@ -119,7 +119,7 @@
 
 org-dartlang-testcase:///const_constructor_coverage_lib2.dart:
 - Bar.named3 (from org-dartlang-testcase:///const_constructor_coverage_lib1.dart:20:15)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Baz.named4 (from org-dartlang-testcase:///const_constructor_coverage_lib2.dart:13:15)
 - Foo.named2 (from org-dartlang-testcase:///const_constructor_coverage_lib1.dart:11:15)
 - Bar.named2 (from org-dartlang-testcase:///const_constructor_coverage_lib1.dart:19:15)

diff --git a/pkg/front_end/testcases/general/constants/const_exponential_compare.dart.weak.expect b/pkg/front_end/testcases/general/constants/const_exponential_compare.dart.weak.expect
index 2804fd4..15bc609 100644
--- a/pkg/front_end/testcases/general/constants/const_exponential_compare.dart.weak.expect
+++ b/pkg/front_end/testcases/general/constants/const_exponential_compare.dart.weak.expect

@@ -41,4 +41,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_exponential_compare.dart:
 - Class. (from org-dartlang-testcase:///const_exponential_compare.dart:4:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/constants/const_exponential_compare.dart.weak.modular.expect b/pkg/front_end/testcases/general/constants/const_exponential_compare.dart.weak.modular.expect
index 2804fd4..15bc609 100644
--- a/pkg/front_end/testcases/general/constants/const_exponential_compare.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/constants/const_exponential_compare.dart.weak.modular.expect

@@ -41,4 +41,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_exponential_compare.dart:
 - Class. (from org-dartlang-testcase:///const_exponential_compare.dart:4:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/constants/const_exponential_compare.dart.weak.transformed.expect b/pkg/front_end/testcases/general/constants/const_exponential_compare.dart.weak.transformed.expect
index 2804fd4..15bc609 100644
--- a/pkg/front_end/testcases/general/constants/const_exponential_compare.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/constants/const_exponential_compare.dart.weak.transformed.expect

@@ -41,4 +41,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_exponential_compare.dart:
 - Class. (from org-dartlang-testcase:///const_exponential_compare.dart:4:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/constants/js_semantics/issue45376.dart.weak.expect b/pkg/front_end/testcases/general/constants/js_semantics/issue45376.dart.weak.expect
index 966e5dd..623585a 100644
--- a/pkg/front_end/testcases/general/constants/js_semantics/issue45376.dart.weak.expect
+++ b/pkg/front_end/testcases/general/constants/js_semantics/issue45376.dart.weak.expect

@@ -19,4 +19,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue45376.dart:
 - MyClass. (from org-dartlang-testcase:///issue45376.dart:8:9)
-- Object. (from org-dartlang-sdk:///lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/constants/js_semantics/issue45376.dart.weak.modular.expect b/pkg/front_end/testcases/general/constants/js_semantics/issue45376.dart.weak.modular.expect
index 966e5dd..623585a 100644
--- a/pkg/front_end/testcases/general/constants/js_semantics/issue45376.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/constants/js_semantics/issue45376.dart.weak.modular.expect

@@ -19,4 +19,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue45376.dart:
 - MyClass. (from org-dartlang-testcase:///issue45376.dart:8:9)
-- Object. (from org-dartlang-sdk:///lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/constants/js_semantics/issue45376.dart.weak.transformed.expect b/pkg/front_end/testcases/general/constants/js_semantics/issue45376.dart.weak.transformed.expect
index 966e5dd..623585a 100644
--- a/pkg/front_end/testcases/general/constants/js_semantics/issue45376.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/constants/js_semantics/issue45376.dart.weak.transformed.expect

@@ -19,4 +19,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue45376.dart:
 - MyClass. (from org-dartlang-testcase:///issue45376.dart:8:9)
-- Object. (from org-dartlang-sdk:///lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/constants/js_semantics/issue46123.dart.weak.expect b/pkg/front_end/testcases/general/constants/js_semantics/issue46123.dart.weak.expect
index d5843e3..899feae 100644
--- a/pkg/front_end/testcases/general/constants/js_semantics/issue46123.dart.weak.expect
+++ b/pkg/front_end/testcases/general/constants/js_semantics/issue46123.dart.weak.expect

@@ -36,4 +36,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue46123.dart:
 - JS. (from org-dartlang-testcase-sdk:///pkg/js/lib/js.dart:23:9)
-- Object. (from org-dartlang-sdk:///lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/constants/js_semantics/issue46123.dart.weak.modular.expect b/pkg/front_end/testcases/general/constants/js_semantics/issue46123.dart.weak.modular.expect
index d5843e3..899feae 100644
--- a/pkg/front_end/testcases/general/constants/js_semantics/issue46123.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/constants/js_semantics/issue46123.dart.weak.modular.expect

@@ -36,4 +36,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue46123.dart:
 - JS. (from org-dartlang-testcase-sdk:///pkg/js/lib/js.dart:23:9)
-- Object. (from org-dartlang-sdk:///lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/constants/js_semantics/issue46123.dart.weak.transformed.expect b/pkg/front_end/testcases/general/constants/js_semantics/issue46123.dart.weak.transformed.expect
index d5843e3..899feae 100644
--- a/pkg/front_end/testcases/general/constants/js_semantics/issue46123.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/constants/js_semantics/issue46123.dart.weak.transformed.expect

@@ -36,4 +36,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue46123.dart:
 - JS. (from org-dartlang-testcase-sdk:///pkg/js/lib/js.dart:23:9)
-- Object. (from org-dartlang-sdk:///lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/constants/js_semantics/issue46123b.dart.weak.expect b/pkg/front_end/testcases/general/constants/js_semantics/issue46123b.dart.weak.expect
index 5ef5a68..2fa40d9 100644
--- a/pkg/front_end/testcases/general/constants/js_semantics/issue46123b.dart.weak.expect
+++ b/pkg/front_end/testcases/general/constants/js_semantics/issue46123b.dart.weak.expect

@@ -38,4 +38,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue46123b.dart:
 - JS. (from org-dartlang-testcase-sdk:///pkg/js/lib/js.dart:23:9)
-- Object. (from org-dartlang-sdk:///lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/constants/js_semantics/issue46123b.dart.weak.modular.expect b/pkg/front_end/testcases/general/constants/js_semantics/issue46123b.dart.weak.modular.expect
index 5ef5a68..2fa40d9 100644
--- a/pkg/front_end/testcases/general/constants/js_semantics/issue46123b.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/constants/js_semantics/issue46123b.dart.weak.modular.expect

@@ -38,4 +38,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue46123b.dart:
 - JS. (from org-dartlang-testcase-sdk:///pkg/js/lib/js.dart:23:9)
-- Object. (from org-dartlang-sdk:///lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/constants/js_semantics/issue46123b.dart.weak.transformed.expect b/pkg/front_end/testcases/general/constants/js_semantics/issue46123b.dart.weak.transformed.expect
index 5ef5a68..2fa40d9 100644
--- a/pkg/front_end/testcases/general/constants/js_semantics/issue46123b.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/constants/js_semantics/issue46123b.dart.weak.transformed.expect

@@ -38,4 +38,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue46123b.dart:
 - JS. (from org-dartlang-testcase-sdk:///pkg/js/lib/js.dart:23:9)
-- Object. (from org-dartlang-sdk:///lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/constants/js_semantics/on_double.dart.weak.expect b/pkg/front_end/testcases/general/constants/js_semantics/on_double.dart.weak.expect
index 03c80f1..9463ed9 100644
--- a/pkg/front_end/testcases/general/constants/js_semantics/on_double.dart.weak.expect
+++ b/pkg/front_end/testcases/general/constants/js_semantics/on_double.dart.weak.expect

@@ -147,5 +147,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///on_double.dart:
 - Class.doubleShift (from org-dartlang-testcase:///on_double.dart:21:9)
-- Object. (from org-dartlang-sdk:///lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///lib/core/object.dart)
 - Class.tripleShift (from org-dartlang-testcase:///on_double.dart:22:9)

diff --git a/pkg/front_end/testcases/general/constants/js_semantics/on_double.dart.weak.modular.expect b/pkg/front_end/testcases/general/constants/js_semantics/on_double.dart.weak.modular.expect
index 03c80f1..9463ed9 100644
--- a/pkg/front_end/testcases/general/constants/js_semantics/on_double.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/constants/js_semantics/on_double.dart.weak.modular.expect

@@ -147,5 +147,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///on_double.dart:
 - Class.doubleShift (from org-dartlang-testcase:///on_double.dart:21:9)
-- Object. (from org-dartlang-sdk:///lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///lib/core/object.dart)
 - Class.tripleShift (from org-dartlang-testcase:///on_double.dart:22:9)

diff --git a/pkg/front_end/testcases/general/constants/js_semantics/on_double.dart.weak.transformed.expect b/pkg/front_end/testcases/general/constants/js_semantics/on_double.dart.weak.transformed.expect
index 03c80f1..9463ed9 100644
--- a/pkg/front_end/testcases/general/constants/js_semantics/on_double.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/constants/js_semantics/on_double.dart.weak.transformed.expect

@@ -147,5 +147,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///on_double.dart:
 - Class.doubleShift (from org-dartlang-testcase:///on_double.dart:21:9)
-- Object. (from org-dartlang-sdk:///lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///lib/core/object.dart)
 - Class.tripleShift (from org-dartlang-testcase:///on_double.dart:22:9)

diff --git a/pkg/front_end/testcases/general/constants/various.dart.weak.expect b/pkg/front_end/testcases/general/constants/various.dart.weak.expect
index dcff246..3fed62f 100644
--- a/pkg/front_end/testcases/general/constants/various.dart.weak.expect
+++ b/pkg/front_end/testcases/general/constants/various.dart.weak.expect

@@ -638,7 +638,7 @@
 org-dartlang-testcase:///various.dart:
 - ExtendsFoo2. (from org-dartlang-testcase:///various.dart:123:9)
 - Foo. (from org-dartlang-testcase:///various.dart:111:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - ConstClassWithFailingAssertWithEmptyMessage. (from org-dartlang-testcase:///various.dart:146:9)
 - ClassWithTypeArguments. (from org-dartlang-testcase:///various.dart:153:9)
 - ConstClassWithFinalFields2. (from org-dartlang-testcase:///various.dart:179:9)

diff --git a/pkg/front_end/testcases/general/constants/various.dart.weak.modular.expect b/pkg/front_end/testcases/general/constants/various.dart.weak.modular.expect
index dcff246..3fed62f 100644
--- a/pkg/front_end/testcases/general/constants/various.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/constants/various.dart.weak.modular.expect

@@ -638,7 +638,7 @@
 org-dartlang-testcase:///various.dart:
 - ExtendsFoo2. (from org-dartlang-testcase:///various.dart:123:9)
 - Foo. (from org-dartlang-testcase:///various.dart:111:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - ConstClassWithFailingAssertWithEmptyMessage. (from org-dartlang-testcase:///various.dart:146:9)
 - ClassWithTypeArguments. (from org-dartlang-testcase:///various.dart:153:9)
 - ConstClassWithFinalFields2. (from org-dartlang-testcase:///various.dart:179:9)

diff --git a/pkg/front_end/testcases/general/constants/various.dart.weak.transformed.expect b/pkg/front_end/testcases/general/constants/various.dart.weak.transformed.expect
index cc993aa..2061140 100644
--- a/pkg/front_end/testcases/general/constants/various.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/constants/various.dart.weak.transformed.expect

@@ -642,7 +642,7 @@
 org-dartlang-testcase:///various.dart:
 - ExtendsFoo2. (from org-dartlang-testcase:///various.dart:123:9)
 - Foo. (from org-dartlang-testcase:///various.dart:111:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - ConstClassWithFailingAssertWithEmptyMessage. (from org-dartlang-testcase:///various.dart:146:9)
 - ClassWithTypeArguments. (from org-dartlang-testcase:///various.dart:153:9)
 - ConstClassWithFinalFields2. (from org-dartlang-testcase:///various.dart:179:9)

diff --git a/pkg/front_end/testcases/general/constants/various2.dart.weak.expect b/pkg/front_end/testcases/general/constants/various2.dart.weak.expect
index dc0f5f6..4a747e3 100644
--- a/pkg/front_end/testcases/general/constants/various2.dart.weak.expect
+++ b/pkg/front_end/testcases/general/constants/various2.dart.weak.expect

@@ -518,7 +518,7 @@
 org-dartlang-testcase:///various2.dart:
 - ExtendsFoo2. (from org-dartlang-testcase:///various2.dart:121:9)
 - Foo. (from org-dartlang-testcase:///various2.dart:109:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - ConstClassWithFailingAssertWithEmptyMessage. (from org-dartlang-testcase:///various2.dart:144:9)
 - ClassWithTypeArguments. (from org-dartlang-testcase:///various2.dart:151:9)
 - ConstClassWithFinalFields2. (from org-dartlang-testcase:///various2.dart:177:9)

diff --git a/pkg/front_end/testcases/general/constants/various2.dart.weak.modular.expect b/pkg/front_end/testcases/general/constants/various2.dart.weak.modular.expect
index dc0f5f6..4a747e3 100644
--- a/pkg/front_end/testcases/general/constants/various2.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/constants/various2.dart.weak.modular.expect

@@ -518,7 +518,7 @@
 org-dartlang-testcase:///various2.dart:
 - ExtendsFoo2. (from org-dartlang-testcase:///various2.dart:121:9)
 - Foo. (from org-dartlang-testcase:///various2.dart:109:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - ConstClassWithFailingAssertWithEmptyMessage. (from org-dartlang-testcase:///various2.dart:144:9)
 - ClassWithTypeArguments. (from org-dartlang-testcase:///various2.dart:151:9)
 - ConstClassWithFinalFields2. (from org-dartlang-testcase:///various2.dart:177:9)

diff --git a/pkg/front_end/testcases/general/constants/various2.dart.weak.transformed.expect b/pkg/front_end/testcases/general/constants/various2.dart.weak.transformed.expect
index 9a213d1..1b444ec 100644
--- a/pkg/front_end/testcases/general/constants/various2.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/constants/various2.dart.weak.transformed.expect

@@ -522,7 +522,7 @@
 org-dartlang-testcase:///various2.dart:
 - ExtendsFoo2. (from org-dartlang-testcase:///various2.dart:121:9)
 - Foo. (from org-dartlang-testcase:///various2.dart:109:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - ConstClassWithFailingAssertWithEmptyMessage. (from org-dartlang-testcase:///various2.dart:144:9)
 - ClassWithTypeArguments. (from org-dartlang-testcase:///various2.dart:151:9)
 - ConstClassWithFinalFields2. (from org-dartlang-testcase:///various2.dart:177:9)

diff --git a/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/const_asserts.dart.weak.expect b/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/const_asserts.dart.weak.expect
index 96b1d69..09b5b74 100644
--- a/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/const_asserts.dart.weak.expect
+++ b/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/const_asserts.dart.weak.expect

@@ -133,7 +133,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_asserts.dart:
 - Foo. (from org-dartlang-testcase:///const_asserts.dart:7:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Foo.withMessage (from org-dartlang-testcase:///const_asserts.dart:13:9)
 - Foo.withInvalidMessage (from org-dartlang-testcase:///const_asserts.dart:15:9)
 - Foo.withInvalidCondition (from org-dartlang-testcase:///const_asserts.dart:16:9)

diff --git a/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/const_asserts.dart.weak.modular.expect b/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/const_asserts.dart.weak.modular.expect
index 96b1d69..09b5b74 100644
--- a/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/const_asserts.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/const_asserts.dart.weak.modular.expect

@@ -133,7 +133,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_asserts.dart:
 - Foo. (from org-dartlang-testcase:///const_asserts.dart:7:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Foo.withMessage (from org-dartlang-testcase:///const_asserts.dart:13:9)
 - Foo.withInvalidMessage (from org-dartlang-testcase:///const_asserts.dart:15:9)
 - Foo.withInvalidCondition (from org-dartlang-testcase:///const_asserts.dart:16:9)

diff --git a/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/const_asserts.dart.weak.transformed.expect b/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/const_asserts.dart.weak.transformed.expect
index dc5b38b..05d5c76 100644
--- a/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/const_asserts.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/const_asserts.dart.weak.transformed.expect

@@ -146,7 +146,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_asserts.dart:
 - Foo. (from org-dartlang-testcase:///const_asserts.dart:7:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Foo.withMessage (from org-dartlang-testcase:///const_asserts.dart:13:9)
 - Foo.withInvalidMessage (from org-dartlang-testcase:///const_asserts.dart:15:9)
 - Foo.withInvalidCondition (from org-dartlang-testcase:///const_asserts.dart:16:9)

diff --git a/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/issue_49245.dart.weak.expect b/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/issue_49245.dart.weak.expect
index 2bbe5db..d71e25e 100644
--- a/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/issue_49245.dart.weak.expect
+++ b/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/issue_49245.dart.weak.expect

@@ -31,4 +31,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue_49245.dart:
 - Foo. (from org-dartlang-testcase:///issue_49245.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/issue_49245.dart.weak.modular.expect b/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/issue_49245.dart.weak.modular.expect
index 2bbe5db..d71e25e 100644
--- a/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/issue_49245.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/issue_49245.dart.weak.modular.expect

@@ -31,4 +31,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue_49245.dart:
 - Foo. (from org-dartlang-testcase:///issue_49245.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/issue_49245.dart.weak.transformed.expect b/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/issue_49245.dart.weak.transformed.expect
index 49f00a5..2e33a2e 100644
--- a/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/issue_49245.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/issue_49245.dart.weak.transformed.expect

@@ -35,4 +35,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue_49245.dart:
 - Foo. (from org-dartlang-testcase:///issue_49245.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/issue_49245_variation_is.dart.weak.expect b/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/issue_49245_variation_is.dart.weak.expect
index 94f0c4f..c1d502c 100644
--- a/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/issue_49245_variation_is.dart.weak.expect
+++ b/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/issue_49245_variation_is.dart.weak.expect

@@ -35,4 +35,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue_49245_variation_is.dart:
 - Foo. (from org-dartlang-testcase:///issue_49245_variation_is.dart:7:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/issue_49245_variation_is.dart.weak.modular.expect b/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/issue_49245_variation_is.dart.weak.modular.expect
index 94f0c4f..c1d502c 100644
--- a/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/issue_49245_variation_is.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/issue_49245_variation_is.dart.weak.modular.expect

@@ -35,4 +35,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue_49245_variation_is.dart:
 - Foo. (from org-dartlang-testcase:///issue_49245_variation_is.dart:7:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/issue_49245_variation_is.dart.weak.transformed.expect b/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/issue_49245_variation_is.dart.weak.transformed.expect
index 35c8cc9..de3bfcd 100644
--- a/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/issue_49245_variation_is.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/issue_49245_variation_is.dart.weak.transformed.expect

@@ -41,4 +41,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue_49245_variation_is.dart:
 - Foo. (from org-dartlang-testcase:///issue_49245_variation_is.dart:7:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/issue_49245_variation_potential_exponential_blowup.dart.weak.expect b/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/issue_49245_variation_potential_exponential_blowup.dart.weak.expect
index 33444f1..104dc37 100644
--- a/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/issue_49245_variation_potential_exponential_blowup.dart.weak.expect
+++ b/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/issue_49245_variation_potential_exponential_blowup.dart.weak.expect

@@ -126,4 +126,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue_49245_variation_potential_exponential_blowup.dart:
 - Foo. (from org-dartlang-testcase:///issue_49245_variation_potential_exponential_blowup.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/issue_49245_variation_potential_exponential_blowup.dart.weak.modular.expect b/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/issue_49245_variation_potential_exponential_blowup.dart.weak.modular.expect
index 33444f1..104dc37 100644
--- a/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/issue_49245_variation_potential_exponential_blowup.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/issue_49245_variation_potential_exponential_blowup.dart.weak.modular.expect

@@ -126,4 +126,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue_49245_variation_potential_exponential_blowup.dart:
 - Foo. (from org-dartlang-testcase:///issue_49245_variation_potential_exponential_blowup.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/issue_49245_variation_potential_exponential_blowup.dart.weak.transformed.expect b/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/issue_49245_variation_potential_exponential_blowup.dart.weak.transformed.expect
index b9d60de..256f863 100644
--- a/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/issue_49245_variation_potential_exponential_blowup.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/issue_49245_variation_potential_exponential_blowup.dart.weak.transformed.expect

@@ -134,4 +134,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue_49245_variation_potential_exponential_blowup.dart:
 - Foo. (from org-dartlang-testcase:///issue_49245_variation_potential_exponential_blowup.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/various.dart.weak.expect b/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/various.dart.weak.expect
index 07abf86..09a8f09 100644
--- a/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/various.dart.weak.expect
+++ b/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/various.dart.weak.expect

@@ -274,7 +274,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///various.dart:
 - C. (from org-dartlang-testcase:///various.dart:92:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Class.redirect (from org-dartlang-testcase:///various.dart:99:9)
 - Class. (from org-dartlang-testcase:///various.dart:98:9)
 - A. (from org-dartlang-testcase:///various.dart:80:9)

diff --git a/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/various.dart.weak.modular.expect b/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/various.dart.weak.modular.expect
index 07abf86..09a8f09 100644
--- a/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/various.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/various.dart.weak.modular.expect

@@ -274,7 +274,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///various.dart:
 - C. (from org-dartlang-testcase:///various.dart:92:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Class.redirect (from org-dartlang-testcase:///various.dart:99:9)
 - Class. (from org-dartlang-testcase:///various.dart:98:9)
 - A. (from org-dartlang-testcase:///various.dart:80:9)

diff --git a/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/various.dart.weak.transformed.expect b/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/various.dart.weak.transformed.expect
index d52e896..7efbe06 100644
--- a/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/various.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/various.dart.weak.transformed.expect

@@ -301,7 +301,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///various.dart:
 - C. (from org-dartlang-testcase:///various.dart:92:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Class.redirect (from org-dartlang-testcase:///various.dart:99:9)
 - Class. (from org-dartlang-testcase:///various.dart:98:9)
 - A. (from org-dartlang-testcase:///various.dart:80:9)

diff --git a/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/various_2.dart.weak.expect b/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/various_2.dart.weak.expect
index 31bfc1b..9adde86 100644
--- a/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/various_2.dart.weak.expect
+++ b/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/various_2.dart.weak.expect

@@ -134,8 +134,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///various_2.dart:
 - Class. (from org-dartlang-testcase:///various_2_lib.dart:8:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 org-dartlang-testcase:///various_2_lib.dart:
 - Class. (from org-dartlang-testcase:///various_2_lib.dart:8:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/various_2.dart.weak.modular.expect b/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/various_2.dart.weak.modular.expect
index 31bfc1b..9adde86 100644
--- a/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/various_2.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/various_2.dart.weak.modular.expect

@@ -134,8 +134,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///various_2.dart:
 - Class. (from org-dartlang-testcase:///various_2_lib.dart:8:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 org-dartlang-testcase:///various_2_lib.dart:
 - Class. (from org-dartlang-testcase:///various_2_lib.dart:8:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/various_2.dart.weak.transformed.expect b/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/various_2.dart.weak.transformed.expect
index 3aec2ef..5f1044e 100644
--- a/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/various_2.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/various_2.dart.weak.transformed.expect

@@ -141,8 +141,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///various_2.dart:
 - Class. (from org-dartlang-testcase:///various_2_lib.dart:8:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 org-dartlang-testcase:///various_2_lib.dart:
 - Class. (from org-dartlang-testcase:///various_2_lib.dart:8:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/constructor_const_inference.dart.weak.expect b/pkg/front_end/testcases/general/constructor_const_inference.dart.weak.expect
index 21168f4..c983d6e 100644
--- a/pkg/front_end/testcases/general/constructor_const_inference.dart.weak.expect
+++ b/pkg/front_end/testcases/general/constructor_const_inference.dart.weak.expect

@@ -33,4 +33,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///constructor_const_inference.dart:
 - _Y. (from org-dartlang-testcase:///constructor_const_inference.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/constructor_const_inference.dart.weak.modular.expect b/pkg/front_end/testcases/general/constructor_const_inference.dart.weak.modular.expect
index 21168f4..c983d6e 100644
--- a/pkg/front_end/testcases/general/constructor_const_inference.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/constructor_const_inference.dart.weak.modular.expect

@@ -33,4 +33,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///constructor_const_inference.dart:
 - _Y. (from org-dartlang-testcase:///constructor_const_inference.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/constructor_const_inference.dart.weak.transformed.expect b/pkg/front_end/testcases/general/constructor_const_inference.dart.weak.transformed.expect
index 21168f4..c983d6e 100644
--- a/pkg/front_end/testcases/general/constructor_const_inference.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/constructor_const_inference.dart.weak.transformed.expect

@@ -33,4 +33,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///constructor_const_inference.dart:
 - _Y. (from org-dartlang-testcase:///constructor_const_inference.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/constructor_patch/main.dart.weak.expect b/pkg/front_end/testcases/general/constructor_patch/main.dart.weak.expect
index 40f37f3..b451599 100644
--- a/pkg/front_end/testcases/general/constructor_patch/main.dart.weak.expect
+++ b/pkg/front_end/testcases/general/constructor_patch/main.dart.weak.expect

@@ -39,4 +39,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///main.dart:
 - Class.constGenerative (from org-dartlang-testcase:///patch_lib.dart:16:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/constructor_patch/main.dart.weak.modular.expect b/pkg/front_end/testcases/general/constructor_patch/main.dart.weak.modular.expect
index 40f37f3..b451599 100644
--- a/pkg/front_end/testcases/general/constructor_patch/main.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/constructor_patch/main.dart.weak.modular.expect

@@ -39,4 +39,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///main.dart:
 - Class.constGenerative (from org-dartlang-testcase:///patch_lib.dart:16:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/constructor_patch/main.dart.weak.transformed.expect b/pkg/front_end/testcases/general/constructor_patch/main.dart.weak.transformed.expect
index 40f37f3..b451599 100644
--- a/pkg/front_end/testcases/general/constructor_patch/main.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/constructor_patch/main.dart.weak.transformed.expect

@@ -39,4 +39,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///main.dart:
 - Class.constGenerative (from org-dartlang-testcase:///patch_lib.dart:16:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/duplicated_declarations.dart.weak.expect b/pkg/front_end/testcases/general/duplicated_declarations.dart.weak.expect
index 4af5b6f..6fea112 100644
--- a/pkg/front_end/testcases/general/duplicated_declarations.dart.weak.expect
+++ b/pkg/front_end/testcases/general/duplicated_declarations.dart.weak.expect

@@ -564,7 +564,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///duplicated_declarations.dart:
 - Enum#1. (from org-dartlang-testcase:///duplicated_declarations.dart:85:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Enum. (from org-dartlang-testcase:///duplicated_declarations.dart:78:6)
 - AnotherEnum. (from org-dartlang-testcase:///duplicated_declarations.dart:91:6)

diff --git a/pkg/front_end/testcases/general/duplicated_declarations.dart.weak.modular.expect b/pkg/front_end/testcases/general/duplicated_declarations.dart.weak.modular.expect
index 4af5b6f..6fea112 100644
--- a/pkg/front_end/testcases/general/duplicated_declarations.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/duplicated_declarations.dart.weak.modular.expect

@@ -564,7 +564,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///duplicated_declarations.dart:
 - Enum#1. (from org-dartlang-testcase:///duplicated_declarations.dart:85:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Enum. (from org-dartlang-testcase:///duplicated_declarations.dart:78:6)
 - AnotherEnum. (from org-dartlang-testcase:///duplicated_declarations.dart:91:6)

diff --git a/pkg/front_end/testcases/general/duplicated_declarations.dart.weak.transformed.expect b/pkg/front_end/testcases/general/duplicated_declarations.dart.weak.transformed.expect
index 4af5b6f..6fea112 100644
--- a/pkg/front_end/testcases/general/duplicated_declarations.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/duplicated_declarations.dart.weak.transformed.expect

@@ -564,7 +564,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///duplicated_declarations.dart:
 - Enum#1. (from org-dartlang-testcase:///duplicated_declarations.dart:85:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Enum. (from org-dartlang-testcase:///duplicated_declarations.dart:78:6)
 - AnotherEnum. (from org-dartlang-testcase:///duplicated_declarations.dart:91:6)

diff --git a/pkg/front_end/testcases/general/enum_names_from_core.dart.weak.expect b/pkg/front_end/testcases/general/enum_names_from_core.dart.weak.expect
index 4267928..2de9020 100644
--- a/pkg/front_end/testcases/general/enum_names_from_core.dart.weak.expect
+++ b/pkg/front_end/testcases/general/enum_names_from_core.dart.weak.expect

@@ -65,5 +65,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///enum_names_from_core.dart:
 - E. (from org-dartlang-testcase:///enum_names_from_core.dart:15:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/enum_names_from_core.dart.weak.modular.expect b/pkg/front_end/testcases/general/enum_names_from_core.dart.weak.modular.expect
index 4267928..2de9020 100644
--- a/pkg/front_end/testcases/general/enum_names_from_core.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/enum_names_from_core.dart.weak.modular.expect

@@ -65,5 +65,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///enum_names_from_core.dart:
 - E. (from org-dartlang-testcase:///enum_names_from_core.dart:15:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/enum_names_from_core.dart.weak.transformed.expect b/pkg/front_end/testcases/general/enum_names_from_core.dart.weak.transformed.expect
index 4267928..2de9020 100644
--- a/pkg/front_end/testcases/general/enum_names_from_core.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/enum_names_from_core.dart.weak.transformed.expect

@@ -65,5 +65,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///enum_names_from_core.dart:
 - E. (from org-dartlang-testcase:///enum_names_from_core.dart:15:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/error_recovery/class_header.dart.weak.expect b/pkg/front_end/testcases/general/error_recovery/class_header.dart.weak.expect
index a1ec92b..aef544d 100644
--- a/pkg/front_end/testcases/general/error_recovery/class_header.dart.weak.expect
+++ b/pkg/front_end/testcases/general/error_recovery/class_header.dart.weak.expect

@@ -3316,8 +3316,8 @@
 org-dartlang-testcase:///class_header.dart:
 - E. (from org-dartlang-testcase:///class_header.dart:61:6)
 - _E&_Enum&C. (from org-dartlang-testcase:///class_header.dart:61:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E1. (from org-dartlang-testcase:///class_header.dart:62:6)
 - E2. (from org-dartlang-testcase:///class_header.dart:63:6)
 - E3. (from org-dartlang-testcase:///class_header.dart:64:6)

diff --git a/pkg/front_end/testcases/general/error_recovery/class_header.dart.weak.modular.expect b/pkg/front_end/testcases/general/error_recovery/class_header.dart.weak.modular.expect
index a1ec92b..aef544d 100644
--- a/pkg/front_end/testcases/general/error_recovery/class_header.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/error_recovery/class_header.dart.weak.modular.expect

@@ -3316,8 +3316,8 @@
 org-dartlang-testcase:///class_header.dart:
 - E. (from org-dartlang-testcase:///class_header.dart:61:6)
 - _E&_Enum&C. (from org-dartlang-testcase:///class_header.dart:61:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E1. (from org-dartlang-testcase:///class_header.dart:62:6)
 - E2. (from org-dartlang-testcase:///class_header.dart:63:6)
 - E3. (from org-dartlang-testcase:///class_header.dart:64:6)

diff --git a/pkg/front_end/testcases/general/error_recovery/class_header.dart.weak.transformed.expect b/pkg/front_end/testcases/general/error_recovery/class_header.dart.weak.transformed.expect
index a1ec92b..aef544d 100644
--- a/pkg/front_end/testcases/general/error_recovery/class_header.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/error_recovery/class_header.dart.weak.transformed.expect

@@ -3316,8 +3316,8 @@
 org-dartlang-testcase:///class_header.dart:
 - E. (from org-dartlang-testcase:///class_header.dart:61:6)
 - _E&_Enum&C. (from org-dartlang-testcase:///class_header.dart:61:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - E1. (from org-dartlang-testcase:///class_header.dart:62:6)
 - E2. (from org-dartlang-testcase:///class_header.dart:63:6)
 - E3. (from org-dartlang-testcase:///class_header.dart:64:6)

diff --git a/pkg/front_end/testcases/general/expressions.dart.weak.expect b/pkg/front_end/testcases/general/expressions.dart.weak.expect
index 68b889a..8519205 100644
--- a/pkg/front_end/testcases/general/expressions.dart.weak.expect
+++ b/pkg/front_end/testcases/general/expressions.dart.weak.expect

@@ -98,4 +98,4 @@
 
 Constructor coverage from constants:
 org-dartlang-testcase:///expressions.dart:
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/expressions.dart.weak.modular.expect b/pkg/front_end/testcases/general/expressions.dart.weak.modular.expect
index 68b889a..8519205 100644
--- a/pkg/front_end/testcases/general/expressions.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/expressions.dart.weak.modular.expect

@@ -98,4 +98,4 @@
 
 Constructor coverage from constants:
 org-dartlang-testcase:///expressions.dart:
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/expressions.dart.weak.transformed.expect b/pkg/front_end/testcases/general/expressions.dart.weak.transformed.expect
index 83bc1a9..1067bdc 100644
--- a/pkg/front_end/testcases/general/expressions.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/expressions.dart.weak.transformed.expect

@@ -104,4 +104,4 @@
 
 Constructor coverage from constants:
 org-dartlang-testcase:///expressions.dart:
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/extension_annotation.dart.weak.expect b/pkg/front_end/testcases/general/extension_annotation.dart.weak.expect
index d44af16..b9f3e64 100644
--- a/pkg/front_end/testcases/general/extension_annotation.dart.weak.expect
+++ b/pkg/front_end/testcases/general/extension_annotation.dart.weak.expect

@@ -20,4 +20,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///extension_annotation.dart:
 - A. (from org-dartlang-testcase:///extension_annotation.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/extension_annotation.dart.weak.modular.expect b/pkg/front_end/testcases/general/extension_annotation.dart.weak.modular.expect
index d44af16..b9f3e64 100644
--- a/pkg/front_end/testcases/general/extension_annotation.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/extension_annotation.dart.weak.modular.expect

@@ -20,4 +20,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///extension_annotation.dart:
 - A. (from org-dartlang-testcase:///extension_annotation.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/extension_annotation.dart.weak.transformed.expect b/pkg/front_end/testcases/general/extension_annotation.dart.weak.transformed.expect
index d44af16..b9f3e64 100644
--- a/pkg/front_end/testcases/general/extension_annotation.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/extension_annotation.dart.weak.transformed.expect

@@ -20,4 +20,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///extension_annotation.dart:
 - A. (from org-dartlang-testcase:///extension_annotation.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/external_import.dart.weak.expect b/pkg/front_end/testcases/general/external_import.dart.weak.expect
index 1b3d235..cede6c8 100644
--- a/pkg/front_end/testcases/general/external_import.dart.weak.expect
+++ b/pkg/front_end/testcases/general/external_import.dart.weak.expect

@@ -37,5 +37,5 @@
 
 Constructor coverage from constants:
 org-dartlang-testcase:///external_import.dart:
-- ExternalName. (from org-dartlang-sdk:///sdk/lib/internal/internal.dart:109:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- ExternalName. (from org-dartlang-sdk:///sdk/lib/internal/internal.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/external_import.dart.weak.modular.expect b/pkg/front_end/testcases/general/external_import.dart.weak.modular.expect
index 1b3d235..cede6c8 100644
--- a/pkg/front_end/testcases/general/external_import.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/external_import.dart.weak.modular.expect

@@ -37,5 +37,5 @@
 
 Constructor coverage from constants:
 org-dartlang-testcase:///external_import.dart:
-- ExternalName. (from org-dartlang-sdk:///sdk/lib/internal/internal.dart:109:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- ExternalName. (from org-dartlang-sdk:///sdk/lib/internal/internal.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/external_import.dart.weak.transformed.expect b/pkg/front_end/testcases/general/external_import.dart.weak.transformed.expect
index 1b3d235..cede6c8 100644
--- a/pkg/front_end/testcases/general/external_import.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/external_import.dart.weak.transformed.expect

@@ -37,5 +37,5 @@
 
 Constructor coverage from constants:
 org-dartlang-testcase:///external_import.dart:
-- ExternalName. (from org-dartlang-sdk:///sdk/lib/internal/internal.dart:109:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- ExternalName. (from org-dartlang-sdk:///sdk/lib/internal/internal.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/ffi_sample.dart.weak.expect b/pkg/front_end/testcases/general/ffi_sample.dart.weak.expect
index 269de28..7776105 100644
--- a/pkg/front_end/testcases/general/ffi_sample.dart.weak.expect
+++ b/pkg/front_end/testcases/general/ffi_sample.dart.weak.expect

@@ -40,7 +40,7 @@
 
 Constructor coverage from constants:
 org-dartlang-testcase:///ffi_sample.dart:
-- Double. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:115:9)
-- _NativeDouble. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:35:9)
-- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Double. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- _NativeDouble. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/ffi_sample.dart.weak.modular.expect b/pkg/front_end/testcases/general/ffi_sample.dart.weak.modular.expect
index 269de28..7776105 100644
--- a/pkg/front_end/testcases/general/ffi_sample.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/ffi_sample.dart.weak.modular.expect

@@ -40,7 +40,7 @@
 
 Constructor coverage from constants:
 org-dartlang-testcase:///ffi_sample.dart:
-- Double. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:115:9)
-- _NativeDouble. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:35:9)
-- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Double. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- _NativeDouble. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/ffi_sample.dart.weak.transformed.expect b/pkg/front_end/testcases/general/ffi_sample.dart.weak.transformed.expect
index 15587c9..d430b04 100644
--- a/pkg/front_end/testcases/general/ffi_sample.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/ffi_sample.dart.weak.transformed.expect

@@ -74,7 +74,7 @@
 
 Constructor coverage from constants:
 org-dartlang-testcase:///ffi_sample.dart:
-- Double. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:115:9)
-- _NativeDouble. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:35:9)
-- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Double. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- _NativeDouble. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/function_type_parameter.dart.weak.expect b/pkg/front_end/testcases/general/function_type_parameter.dart.weak.expect
index 9c2602d..e9c540d 100644
--- a/pkg/front_end/testcases/general/function_type_parameter.dart.weak.expect
+++ b/pkg/front_end/testcases/general/function_type_parameter.dart.weak.expect

@@ -57,4 +57,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///function_type_parameter.dart:
 - A. (from org-dartlang-testcase:///function_type_parameter.dart:8:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/function_type_parameter.dart.weak.modular.expect b/pkg/front_end/testcases/general/function_type_parameter.dart.weak.modular.expect
index 9c2602d..e9c540d 100644
--- a/pkg/front_end/testcases/general/function_type_parameter.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/function_type_parameter.dart.weak.modular.expect

@@ -57,4 +57,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///function_type_parameter.dart:
 - A. (from org-dartlang-testcase:///function_type_parameter.dart:8:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/function_type_parameter.dart.weak.transformed.expect b/pkg/front_end/testcases/general/function_type_parameter.dart.weak.transformed.expect
index 9c2602d..e9c540d 100644
--- a/pkg/front_end/testcases/general/function_type_parameter.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/function_type_parameter.dart.weak.transformed.expect

@@ -57,4 +57,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///function_type_parameter.dart:
 - A. (from org-dartlang-testcase:///function_type_parameter.dart:8:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/instantiate_enum/main.dart.weak.expect b/pkg/front_end/testcases/general/instantiate_enum/main.dart.weak.expect
index f28b690..8887d6a 100644
--- a/pkg/front_end/testcases/general/instantiate_enum/main.dart.weak.expect
+++ b/pkg/front_end/testcases/general/instantiate_enum/main.dart.weak.expect

@@ -89,10 +89,10 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///main_lib.dart:
 - Enum2. (from org-dartlang-testcase:///main_lib.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 org-dartlang-testcase:///main.dart:
 - Enum1. (from org-dartlang-testcase:///main.dart:7:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/instantiate_enum/main.dart.weak.modular.expect b/pkg/front_end/testcases/general/instantiate_enum/main.dart.weak.modular.expect
index da73606..b33c075 100644
--- a/pkg/front_end/testcases/general/instantiate_enum/main.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/instantiate_enum/main.dart.weak.modular.expect

@@ -68,5 +68,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///main.dart:
 - Enum1. (from org-dartlang-testcase:///main.dart:7:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/instantiate_enum/main.dart.weak.outline.expect b/pkg/front_end/testcases/general/instantiate_enum/main.dart.weak.outline.expect
index 58d6004..0b2d585 100644
--- a/pkg/front_end/testcases/general/instantiate_enum/main.dart.weak.outline.expect
+++ b/pkg/front_end/testcases/general/instantiate_enum/main.dart.weak.outline.expect

@@ -62,5 +62,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///main_lib.dart:
 - Enum2. (from org-dartlang-testcase:///main_lib.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/instantiate_enum/main.dart.weak.transformed.expect b/pkg/front_end/testcases/general/instantiate_enum/main.dart.weak.transformed.expect
index f28b690..8887d6a 100644
--- a/pkg/front_end/testcases/general/instantiate_enum/main.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/instantiate_enum/main.dart.weak.transformed.expect

@@ -89,10 +89,10 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///main_lib.dart:
 - Enum2. (from org-dartlang-testcase:///main_lib.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 org-dartlang-testcase:///main.dart:
 - Enum1. (from org-dartlang-testcase:///main.dart:7:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/issue31767.dart.weak.expect b/pkg/front_end/testcases/general/issue31767.dart.weak.expect
index af92d7d..53681ef 100644
--- a/pkg/front_end/testcases/general/issue31767.dart.weak.expect
+++ b/pkg/front_end/testcases/general/issue31767.dart.weak.expect

@@ -128,8 +128,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue31767.dart:
 - _A. (from org-dartlang-testcase:///issue31767_lib.dart:20:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 org-dartlang-testcase:///issue31767_lib.dart:
 - _A. (from org-dartlang-testcase:///issue31767_lib.dart:20:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/issue31767.dart.weak.modular.expect b/pkg/front_end/testcases/general/issue31767.dart.weak.modular.expect
index af92d7d..53681ef 100644
--- a/pkg/front_end/testcases/general/issue31767.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/issue31767.dart.weak.modular.expect

@@ -128,8 +128,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue31767.dart:
 - _A. (from org-dartlang-testcase:///issue31767_lib.dart:20:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 org-dartlang-testcase:///issue31767_lib.dart:
 - _A. (from org-dartlang-testcase:///issue31767_lib.dart:20:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/issue31767.dart.weak.transformed.expect b/pkg/front_end/testcases/general/issue31767.dart.weak.transformed.expect
index 18bee70..ad88d29 100644
--- a/pkg/front_end/testcases/general/issue31767.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/issue31767.dart.weak.transformed.expect

@@ -128,8 +128,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue31767.dart:
 - _A. (from org-dartlang-testcase:///issue31767_lib.dart:20:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 org-dartlang-testcase:///issue31767_lib.dart:
 - _A. (from org-dartlang-testcase:///issue31767_lib.dart:20:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/issue41070.dart.weak.expect b/pkg/front_end/testcases/general/issue41070.dart.weak.expect
index a93c83e..bc85e4c 100644
--- a/pkg/front_end/testcases/general/issue41070.dart.weak.expect
+++ b/pkg/front_end/testcases/general/issue41070.dart.weak.expect

@@ -36,4 +36,4 @@
 org-dartlang-testcase:///issue41070.dart:
 - Application. (from org-dartlang-testcase:///issue41070.dart:12:7)
 - Base. (from org-dartlang-testcase:///issue41070.dart:9:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/issue41070.dart.weak.modular.expect b/pkg/front_end/testcases/general/issue41070.dart.weak.modular.expect
index a93c83e..bc85e4c 100644
--- a/pkg/front_end/testcases/general/issue41070.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/issue41070.dart.weak.modular.expect

@@ -36,4 +36,4 @@
 org-dartlang-testcase:///issue41070.dart:
 - Application. (from org-dartlang-testcase:///issue41070.dart:12:7)
 - Base. (from org-dartlang-testcase:///issue41070.dart:9:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/issue41070.dart.weak.transformed.expect b/pkg/front_end/testcases/general/issue41070.dart.weak.transformed.expect
index c16b436..2a2d98a 100644
--- a/pkg/front_end/testcases/general/issue41070.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/issue41070.dart.weak.transformed.expect

@@ -36,4 +36,4 @@
 org-dartlang-testcase:///issue41070.dart:
 - Application. (from org-dartlang-testcase:///issue41070.dart:12:7)
 - Base. (from org-dartlang-testcase:///issue41070.dart:9:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/issue45003/main.dart.weak.expect b/pkg/front_end/testcases/general/issue45003/main.dart.weak.expect
index d657617..93a9c92 100644
--- a/pkg/front_end/testcases/general/issue45003/main.dart.weak.expect
+++ b/pkg/front_end/testcases/general/issue45003/main.dart.weak.expect

@@ -50,4 +50,4 @@
 org-dartlang-testcase:///main.dart:
 - Bar. (from org-dartlang-testcase:///bar_lib.dart:8:9)
 - Foo. (from org-dartlang-testcase:///foo_lib.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/issue45003/main.dart.weak.modular.expect b/pkg/front_end/testcases/general/issue45003/main.dart.weak.modular.expect
index d657617..93a9c92 100644
--- a/pkg/front_end/testcases/general/issue45003/main.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/issue45003/main.dart.weak.modular.expect

@@ -50,4 +50,4 @@
 org-dartlang-testcase:///main.dart:
 - Bar. (from org-dartlang-testcase:///bar_lib.dart:8:9)
 - Foo. (from org-dartlang-testcase:///foo_lib.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/issue45003/main.dart.weak.transformed.expect b/pkg/front_end/testcases/general/issue45003/main.dart.weak.transformed.expect
index d657617..93a9c92 100644
--- a/pkg/front_end/testcases/general/issue45003/main.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/issue45003/main.dart.weak.transformed.expect

@@ -50,4 +50,4 @@
 org-dartlang-testcase:///main.dart:
 - Bar. (from org-dartlang-testcase:///bar_lib.dart:8:9)
 - Foo. (from org-dartlang-testcase:///foo_lib.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/issue45003_2.dart.weak.expect b/pkg/front_end/testcases/general/issue45003_2.dart.weak.expect
index 9e86d1c..fad894f 100644
--- a/pkg/front_end/testcases/general/issue45003_2.dart.weak.expect
+++ b/pkg/front_end/testcases/general/issue45003_2.dart.weak.expect

@@ -32,4 +32,4 @@
 org-dartlang-testcase:///issue45003_2.dart:
 - B. (from org-dartlang-testcase:///issue45003_2.dart:10:9)
 - A. (from org-dartlang-testcase:///issue45003_2.dart:14:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/issue45003_2.dart.weak.modular.expect b/pkg/front_end/testcases/general/issue45003_2.dart.weak.modular.expect
index 9e86d1c..fad894f 100644
--- a/pkg/front_end/testcases/general/issue45003_2.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/issue45003_2.dart.weak.modular.expect

@@ -32,4 +32,4 @@
 org-dartlang-testcase:///issue45003_2.dart:
 - B. (from org-dartlang-testcase:///issue45003_2.dart:10:9)
 - A. (from org-dartlang-testcase:///issue45003_2.dart:14:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/issue45003_2.dart.weak.transformed.expect b/pkg/front_end/testcases/general/issue45003_2.dart.weak.transformed.expect
index 9e86d1c..fad894f 100644
--- a/pkg/front_end/testcases/general/issue45003_2.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/issue45003_2.dart.weak.transformed.expect

@@ -32,4 +32,4 @@
 org-dartlang-testcase:///issue45003_2.dart:
 - B. (from org-dartlang-testcase:///issue45003_2.dart:10:9)
 - A. (from org-dartlang-testcase:///issue45003_2.dart:14:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/issue45101/main.dart.weak.expect b/pkg/front_end/testcases/general/issue45101/main.dart.weak.expect
index c62cfe1..115c105 100644
--- a/pkg/front_end/testcases/general/issue45101/main.dart.weak.expect
+++ b/pkg/front_end/testcases/general/issue45101/main.dart.weak.expect

@@ -38,5 +38,5 @@
 
 Constructor coverage from constants:
 org-dartlang-testcase:///origin_lib.dart:
-- pragma._ (from org-dartlang-sdk:///sdk/lib/core/annotations.dart:188:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- pragma._ (from org-dartlang-sdk:///sdk/lib/core/annotations.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/issue45101/main.dart.weak.modular.expect b/pkg/front_end/testcases/general/issue45101/main.dart.weak.modular.expect
index c62cfe1..115c105 100644
--- a/pkg/front_end/testcases/general/issue45101/main.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/issue45101/main.dart.weak.modular.expect

@@ -38,5 +38,5 @@
 
 Constructor coverage from constants:
 org-dartlang-testcase:///origin_lib.dart:
-- pragma._ (from org-dartlang-sdk:///sdk/lib/core/annotations.dart:188:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- pragma._ (from org-dartlang-sdk:///sdk/lib/core/annotations.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/issue45101/main.dart.weak.transformed.expect b/pkg/front_end/testcases/general/issue45101/main.dart.weak.transformed.expect
index c62cfe1..115c105 100644
--- a/pkg/front_end/testcases/general/issue45101/main.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/issue45101/main.dart.weak.transformed.expect

@@ -38,5 +38,5 @@
 
 Constructor coverage from constants:
 org-dartlang-testcase:///origin_lib.dart:
-- pragma._ (from org-dartlang-sdk:///sdk/lib/core/annotations.dart:188:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- pragma._ (from org-dartlang-sdk:///sdk/lib/core/annotations.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/issue46518.dart.weak.expect b/pkg/front_end/testcases/general/issue46518.dart.weak.expect
index 2c9870a..4fb9636 100644
--- a/pkg/front_end/testcases/general/issue46518.dart.weak.expect
+++ b/pkg/front_end/testcases/general/issue46518.dart.weak.expect

@@ -63,10 +63,10 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue46518.dart:
 - OT. (from org-dartlang-testcase:///issue46518_lib.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - CheckIdentical. (from org-dartlang-testcase:///issue46518.dart:11:9)
 
 org-dartlang-testcase:///issue46518_lib.dart:
 - OT. (from org-dartlang-testcase:///issue46518_lib.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - CheckIdentical. (from org-dartlang-testcase:///issue46518.dart:11:9)

diff --git a/pkg/front_end/testcases/general/issue46518.dart.weak.modular.expect b/pkg/front_end/testcases/general/issue46518.dart.weak.modular.expect
index 2c9870a..4fb9636 100644
--- a/pkg/front_end/testcases/general/issue46518.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/issue46518.dart.weak.modular.expect

@@ -63,10 +63,10 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue46518.dart:
 - OT. (from org-dartlang-testcase:///issue46518_lib.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - CheckIdentical. (from org-dartlang-testcase:///issue46518.dart:11:9)
 
 org-dartlang-testcase:///issue46518_lib.dart:
 - OT. (from org-dartlang-testcase:///issue46518_lib.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - CheckIdentical. (from org-dartlang-testcase:///issue46518.dart:11:9)

diff --git a/pkg/front_end/testcases/general/issue46518.dart.weak.transformed.expect b/pkg/front_end/testcases/general/issue46518.dart.weak.transformed.expect
index 2c9870a..4fb9636 100644
--- a/pkg/front_end/testcases/general/issue46518.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/issue46518.dart.weak.transformed.expect

@@ -63,10 +63,10 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue46518.dart:
 - OT. (from org-dartlang-testcase:///issue46518_lib.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - CheckIdentical. (from org-dartlang-testcase:///issue46518.dart:11:9)
 
 org-dartlang-testcase:///issue46518_lib.dart:
 - OT. (from org-dartlang-testcase:///issue46518_lib.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - CheckIdentical. (from org-dartlang-testcase:///issue46518.dart:11:9)

diff --git a/pkg/front_end/testcases/general/issue47036.dart.weak.expect b/pkg/front_end/testcases/general/issue47036.dart.weak.expect
index 0be5e5b..c91aac8 100644
--- a/pkg/front_end/testcases/general/issue47036.dart.weak.expect
+++ b/pkg/front_end/testcases/general/issue47036.dart.weak.expect

@@ -54,5 +54,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue47036.dart:
 - _$_SSidebar. (from org-dartlang-testcase:///issue47036.dart:36:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Default. (from org-dartlang-testcase:///issue47036.dart:6:9)

diff --git a/pkg/front_end/testcases/general/issue47036.dart.weak.modular.expect b/pkg/front_end/testcases/general/issue47036.dart.weak.modular.expect
index 0be5e5b..c91aac8 100644
--- a/pkg/front_end/testcases/general/issue47036.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/issue47036.dart.weak.modular.expect

@@ -54,5 +54,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue47036.dart:
 - _$_SSidebar. (from org-dartlang-testcase:///issue47036.dart:36:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Default. (from org-dartlang-testcase:///issue47036.dart:6:9)

diff --git a/pkg/front_end/testcases/general/issue47036.dart.weak.transformed.expect b/pkg/front_end/testcases/general/issue47036.dart.weak.transformed.expect
index 0be5e5b..c91aac8 100644
--- a/pkg/front_end/testcases/general/issue47036.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/issue47036.dart.weak.transformed.expect

@@ -54,5 +54,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue47036.dart:
 - _$_SSidebar. (from org-dartlang-testcase:///issue47036.dart:36:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Default. (from org-dartlang-testcase:///issue47036.dart:6:9)

diff --git a/pkg/front_end/testcases/general/issue47339.dart.weak.expect b/pkg/front_end/testcases/general/issue47339.dart.weak.expect
index 02f1b57..00a3428 100644
--- a/pkg/front_end/testcases/general/issue47339.dart.weak.expect
+++ b/pkg/front_end/testcases/general/issue47339.dart.weak.expect

@@ -37,5 +37,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue47339.dart:
 - Foo.named (from org-dartlang-testcase:///issue47339.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - FooGeneric.named (from org-dartlang-testcase:///issue47339.dart:17:9)

diff --git a/pkg/front_end/testcases/general/issue47339.dart.weak.modular.expect b/pkg/front_end/testcases/general/issue47339.dart.weak.modular.expect
index 02f1b57..00a3428 100644
--- a/pkg/front_end/testcases/general/issue47339.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/issue47339.dart.weak.modular.expect

@@ -37,5 +37,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue47339.dart:
 - Foo.named (from org-dartlang-testcase:///issue47339.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - FooGeneric.named (from org-dartlang-testcase:///issue47339.dart:17:9)

diff --git a/pkg/front_end/testcases/general/issue47339.dart.weak.transformed.expect b/pkg/front_end/testcases/general/issue47339.dart.weak.transformed.expect
index 02f1b57..00a3428 100644
--- a/pkg/front_end/testcases/general/issue47339.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/issue47339.dart.weak.transformed.expect

@@ -37,5 +37,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue47339.dart:
 - Foo.named (from org-dartlang-testcase:///issue47339.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - FooGeneric.named (from org-dartlang-testcase:///issue47339.dart:17:9)

diff --git a/pkg/front_end/testcases/general/issue47994a.dart.weak.expect b/pkg/front_end/testcases/general/issue47994a.dart.weak.expect
index af71fb3..3128cf6 100644
--- a/pkg/front_end/testcases/general/issue47994a.dart.weak.expect
+++ b/pkg/front_end/testcases/general/issue47994a.dart.weak.expect

@@ -103,4 +103,4 @@
 org-dartlang-testcase:///issue47994a.dart:
 - BuildAssert. (from org-dartlang-testcase:///issue47994a.dart:10:9)
 - Const. (from org-dartlang-testcase:///issue47994a.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/issue47994a.dart.weak.modular.expect b/pkg/front_end/testcases/general/issue47994a.dart.weak.modular.expect
index af71fb3..3128cf6 100644
--- a/pkg/front_end/testcases/general/issue47994a.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/issue47994a.dart.weak.modular.expect

@@ -103,4 +103,4 @@
 org-dartlang-testcase:///issue47994a.dart:
 - BuildAssert. (from org-dartlang-testcase:///issue47994a.dart:10:9)
 - Const. (from org-dartlang-testcase:///issue47994a.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/issue47994a.dart.weak.transformed.expect b/pkg/front_end/testcases/general/issue47994a.dart.weak.transformed.expect
index af71fb3..3128cf6 100644
--- a/pkg/front_end/testcases/general/issue47994a.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/issue47994a.dart.weak.transformed.expect

@@ -103,4 +103,4 @@
 org-dartlang-testcase:///issue47994a.dart:
 - BuildAssert. (from org-dartlang-testcase:///issue47994a.dart:10:9)
 - Const. (from org-dartlang-testcase:///issue47994a.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/issue47994b.dart.weak.expect b/pkg/front_end/testcases/general/issue47994b.dart.weak.expect
index 94d8be3..0bb565f 100644
--- a/pkg/front_end/testcases/general/issue47994b.dart.weak.expect
+++ b/pkg/front_end/testcases/general/issue47994b.dart.weak.expect

@@ -81,4 +81,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue47994b.dart:
 - Const. (from org-dartlang-testcase:///issue47994b.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/issue47994b.dart.weak.modular.expect b/pkg/front_end/testcases/general/issue47994b.dart.weak.modular.expect
index 94d8be3..0bb565f 100644
--- a/pkg/front_end/testcases/general/issue47994b.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/issue47994b.dart.weak.modular.expect

@@ -81,4 +81,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue47994b.dart:
 - Const. (from org-dartlang-testcase:///issue47994b.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/issue47994b.dart.weak.transformed.expect b/pkg/front_end/testcases/general/issue47994b.dart.weak.transformed.expect
index 94d8be3..0bb565f 100644
--- a/pkg/front_end/testcases/general/issue47994b.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/issue47994b.dart.weak.transformed.expect

@@ -81,4 +81,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue47994b.dart:
 - Const. (from org-dartlang-testcase:///issue47994b.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/issue48148.dart.weak.expect b/pkg/front_end/testcases/general/issue48148.dart.weak.expect
index dd37ee2..4e9350a 100644
--- a/pkg/front_end/testcases/general/issue48148.dart.weak.expect
+++ b/pkg/front_end/testcases/general/issue48148.dart.weak.expect

@@ -77,7 +77,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue48148.dart:
 - HBaseLeaf. (from org-dartlang-testcase:///issue48148.dart:45:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - HBaseChild. (from org-dartlang-testcase:///issue48148.dart:37:9)
 - HBaseError. (from org-dartlang-testcase:///issue48148.dart:53:9)
 - HBaseComposite. (from org-dartlang-testcase:///issue48148.dart:28:9)

diff --git a/pkg/front_end/testcases/general/issue48148.dart.weak.modular.expect b/pkg/front_end/testcases/general/issue48148.dart.weak.modular.expect
index dd37ee2..4e9350a 100644
--- a/pkg/front_end/testcases/general/issue48148.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/issue48148.dart.weak.modular.expect

@@ -77,7 +77,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue48148.dart:
 - HBaseLeaf. (from org-dartlang-testcase:///issue48148.dart:45:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - HBaseChild. (from org-dartlang-testcase:///issue48148.dart:37:9)
 - HBaseError. (from org-dartlang-testcase:///issue48148.dart:53:9)
 - HBaseComposite. (from org-dartlang-testcase:///issue48148.dart:28:9)

diff --git a/pkg/front_end/testcases/general/issue48148.dart.weak.transformed.expect b/pkg/front_end/testcases/general/issue48148.dart.weak.transformed.expect
index dd37ee2..4e9350a 100644
--- a/pkg/front_end/testcases/general/issue48148.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/issue48148.dart.weak.transformed.expect

@@ -77,7 +77,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue48148.dart:
 - HBaseLeaf. (from org-dartlang-testcase:///issue48148.dart:45:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - HBaseChild. (from org-dartlang-testcase:///issue48148.dart:37:9)
 - HBaseError. (from org-dartlang-testcase:///issue48148.dart:53:9)
 - HBaseComposite. (from org-dartlang-testcase:///issue48148.dart:28:9)

diff --git a/pkg/front_end/testcases/general/issue48487.dart.weak.expect b/pkg/front_end/testcases/general/issue48487.dart.weak.expect
index 5a205df..3cd7dda 100644
--- a/pkg/front_end/testcases/general/issue48487.dart.weak.expect
+++ b/pkg/front_end/testcases/general/issue48487.dart.weak.expect

@@ -40,5 +40,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue48487.dart:
 - T. (from org-dartlang-testcase:///issue48487.dart:7:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/issue48487.dart.weak.modular.expect b/pkg/front_end/testcases/general/issue48487.dart.weak.modular.expect
index 5a205df..3cd7dda 100644
--- a/pkg/front_end/testcases/general/issue48487.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/issue48487.dart.weak.modular.expect

@@ -40,5 +40,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue48487.dart:
 - T. (from org-dartlang-testcase:///issue48487.dart:7:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/issue48487.dart.weak.transformed.expect b/pkg/front_end/testcases/general/issue48487.dart.weak.transformed.expect
index 5a205df..3cd7dda 100644
--- a/pkg/front_end/testcases/general/issue48487.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/issue48487.dart.weak.transformed.expect

@@ -40,5 +40,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue48487.dart:
 - T. (from org-dartlang-testcase:///issue48487.dart:7:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/issue49087.dart.weak.expect b/pkg/front_end/testcases/general/issue49087.dart.weak.expect
index 0664156..476c67e 100644
--- a/pkg/front_end/testcases/general/issue49087.dart.weak.expect
+++ b/pkg/front_end/testcases/general/issue49087.dart.weak.expect

@@ -26,4 +26,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue49087.dart:
 - A. (from org-dartlang-testcase:///issue49087.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/issue49087.dart.weak.modular.expect b/pkg/front_end/testcases/general/issue49087.dart.weak.modular.expect
index 0664156..476c67e 100644
--- a/pkg/front_end/testcases/general/issue49087.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/issue49087.dart.weak.modular.expect

@@ -26,4 +26,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue49087.dart:
 - A. (from org-dartlang-testcase:///issue49087.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/issue49087.dart.weak.transformed.expect b/pkg/front_end/testcases/general/issue49087.dart.weak.transformed.expect
index 0664156..476c67e 100644
--- a/pkg/front_end/testcases/general/issue49087.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/issue49087.dart.weak.transformed.expect

@@ -26,4 +26,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue49087.dart:
 - A. (from org-dartlang-testcase:///issue49087.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/issue49216.dart.weak.expect b/pkg/front_end/testcases/general/issue49216.dart.weak.expect
index eee9a44..27e5c68 100644
--- a/pkg/front_end/testcases/general/issue49216.dart.weak.expect
+++ b/pkg/front_end/testcases/general/issue49216.dart.weak.expect

@@ -30,5 +30,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue49216.dart:
 - E. (from org-dartlang-testcase:///issue49216.dart:8:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/issue49216.dart.weak.modular.expect b/pkg/front_end/testcases/general/issue49216.dart.weak.modular.expect
index eee9a44..27e5c68 100644
--- a/pkg/front_end/testcases/general/issue49216.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/issue49216.dart.weak.modular.expect

@@ -30,5 +30,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue49216.dart:
 - E. (from org-dartlang-testcase:///issue49216.dart:8:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/issue49216.dart.weak.transformed.expect b/pkg/front_end/testcases/general/issue49216.dart.weak.transformed.expect
index eee9a44..27e5c68 100644
--- a/pkg/front_end/testcases/general/issue49216.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/issue49216.dart.weak.transformed.expect

@@ -30,5 +30,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue49216.dart:
 - E. (from org-dartlang-testcase:///issue49216.dart:8:9)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/magic_const.dart.weak.expect b/pkg/front_end/testcases/general/magic_const.dart.weak.expect
index 4746b81..bc204f0 100644
--- a/pkg/front_end/testcases/general/magic_const.dart.weak.expect
+++ b/pkg/front_end/testcases/general/magic_const.dart.weak.expect

@@ -58,4 +58,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///magic_const.dart:
 - Constant. (from org-dartlang-testcase:///magic_const.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/magic_const.dart.weak.modular.expect b/pkg/front_end/testcases/general/magic_const.dart.weak.modular.expect
index 4746b81..bc204f0 100644
--- a/pkg/front_end/testcases/general/magic_const.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/magic_const.dart.weak.modular.expect

@@ -58,4 +58,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///magic_const.dart:
 - Constant. (from org-dartlang-testcase:///magic_const.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/magic_const.dart.weak.transformed.expect b/pkg/front_end/testcases/general/magic_const.dart.weak.transformed.expect
index bb758cd..110e6fa 100644
--- a/pkg/front_end/testcases/general/magic_const.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/magic_const.dart.weak.transformed.expect

@@ -62,4 +62,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///magic_const.dart:
 - Constant. (from org-dartlang-testcase:///magic_const.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/metadata_enum.dart.weak.expect b/pkg/front_end/testcases/general/metadata_enum.dart.weak.expect
index 55cf7fe..1dada96 100644
--- a/pkg/front_end/testcases/general/metadata_enum.dart.weak.expect
+++ b/pkg/front_end/testcases/general/metadata_enum.dart.weak.expect

@@ -35,5 +35,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///metadata_enum.dart:
 - E. (from org-dartlang-testcase:///metadata_enum.dart:8:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/metadata_enum.dart.weak.modular.expect b/pkg/front_end/testcases/general/metadata_enum.dart.weak.modular.expect
index 55cf7fe..1dada96 100644
--- a/pkg/front_end/testcases/general/metadata_enum.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/metadata_enum.dart.weak.modular.expect

@@ -35,5 +35,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///metadata_enum.dart:
 - E. (from org-dartlang-testcase:///metadata_enum.dart:8:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/metadata_enum.dart.weak.transformed.expect b/pkg/front_end/testcases/general/metadata_enum.dart.weak.transformed.expect
index 55cf7fe..1dada96 100644
--- a/pkg/front_end/testcases/general/metadata_enum.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/metadata_enum.dart.weak.transformed.expect

@@ -35,5 +35,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///metadata_enum.dart:
 - E. (from org-dartlang-testcase:///metadata_enum.dart:8:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/redirecting_factory_const_inference.dart.weak.expect b/pkg/front_end/testcases/general/redirecting_factory_const_inference.dart.weak.expect
index 580833f..690fd3c 100644
--- a/pkg/front_end/testcases/general/redirecting_factory_const_inference.dart.weak.expect
+++ b/pkg/front_end/testcases/general/redirecting_factory_const_inference.dart.weak.expect

@@ -39,4 +39,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///redirecting_factory_const_inference.dart:
 - _Y. (from org-dartlang-testcase:///redirecting_factory_const_inference.dart:14:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/redirecting_factory_const_inference.dart.weak.modular.expect b/pkg/front_end/testcases/general/redirecting_factory_const_inference.dart.weak.modular.expect
index 580833f..690fd3c 100644
--- a/pkg/front_end/testcases/general/redirecting_factory_const_inference.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/redirecting_factory_const_inference.dart.weak.modular.expect

@@ -39,4 +39,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///redirecting_factory_const_inference.dart:
 - _Y. (from org-dartlang-testcase:///redirecting_factory_const_inference.dart:14:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/redirecting_factory_const_inference.dart.weak.transformed.expect b/pkg/front_end/testcases/general/redirecting_factory_const_inference.dart.weak.transformed.expect
index 580833f..690fd3c 100644
--- a/pkg/front_end/testcases/general/redirecting_factory_const_inference.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/redirecting_factory_const_inference.dart.weak.transformed.expect

@@ -39,4 +39,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///redirecting_factory_const_inference.dart:
 - _Y. (from org-dartlang-testcase:///redirecting_factory_const_inference.dart:14:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/redirecting_factory_invocation_metadata.dart.weak.expect b/pkg/front_end/testcases/general/redirecting_factory_invocation_metadata.dart.weak.expect
index 41d3f4f..c0e66e6 100644
--- a/pkg/front_end/testcases/general/redirecting_factory_invocation_metadata.dart.weak.expect
+++ b/pkg/front_end/testcases/general/redirecting_factory_invocation_metadata.dart.weak.expect

@@ -105,4 +105,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///redirecting_factory_invocation_metadata.dart:
 - Const.internal (from org-dartlang-testcase:///redirecting_factory_invocation_metadata.dart:19:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/redirecting_factory_invocation_metadata.dart.weak.modular.expect b/pkg/front_end/testcases/general/redirecting_factory_invocation_metadata.dart.weak.modular.expect
index 41d3f4f..c0e66e6 100644
--- a/pkg/front_end/testcases/general/redirecting_factory_invocation_metadata.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/redirecting_factory_invocation_metadata.dart.weak.modular.expect

@@ -105,4 +105,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///redirecting_factory_invocation_metadata.dart:
 - Const.internal (from org-dartlang-testcase:///redirecting_factory_invocation_metadata.dart:19:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/redirecting_factory_invocation_metadata.dart.weak.transformed.expect b/pkg/front_end/testcases/general/redirecting_factory_invocation_metadata.dart.weak.transformed.expect
index 41d3f4f..c0e66e6 100644
--- a/pkg/front_end/testcases/general/redirecting_factory_invocation_metadata.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/redirecting_factory_invocation_metadata.dart.weak.transformed.expect

@@ -105,4 +105,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///redirecting_factory_invocation_metadata.dart:
 - Const.internal (from org-dartlang-testcase:///redirecting_factory_invocation_metadata.dart:19:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/redirection_type_arguments.dart.weak.expect b/pkg/front_end/testcases/general/redirection_type_arguments.dart.weak.expect
index 2819621..a7e77bc 100644
--- a/pkg/front_end/testcases/general/redirection_type_arguments.dart.weak.expect
+++ b/pkg/front_end/testcases/general/redirection_type_arguments.dart.weak.expect

@@ -34,4 +34,4 @@
 org-dartlang-testcase:///redirection_type_arguments.dart:
 - B. (from org-dartlang-testcase:///redirection_type_arguments.dart:16:9)
 - A.empty (from org-dartlang-testcase:///redirection_type_arguments.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/redirection_type_arguments.dart.weak.modular.expect b/pkg/front_end/testcases/general/redirection_type_arguments.dart.weak.modular.expect
index 2819621..a7e77bc 100644
--- a/pkg/front_end/testcases/general/redirection_type_arguments.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/redirection_type_arguments.dart.weak.modular.expect

@@ -34,4 +34,4 @@
 org-dartlang-testcase:///redirection_type_arguments.dart:
 - B. (from org-dartlang-testcase:///redirection_type_arguments.dart:16:9)
 - A.empty (from org-dartlang-testcase:///redirection_type_arguments.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/redirection_type_arguments.dart.weak.transformed.expect b/pkg/front_end/testcases/general/redirection_type_arguments.dart.weak.transformed.expect
index 2819621..a7e77bc 100644
--- a/pkg/front_end/testcases/general/redirection_type_arguments.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/redirection_type_arguments.dart.weak.transformed.expect

@@ -34,4 +34,4 @@
 org-dartlang-testcase:///redirection_type_arguments.dart:
 - B. (from org-dartlang-testcase:///redirection_type_arguments.dart:16:9)
 - A.empty (from org-dartlang-testcase:///redirection_type_arguments.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/type_variable_annotations.dart.weak.expect b/pkg/front_end/testcases/general/type_variable_annotations.dart.weak.expect
index 21c0f72..47a4bc8 100644
--- a/pkg/front_end/testcases/general/type_variable_annotations.dart.weak.expect
+++ b/pkg/front_end/testcases/general/type_variable_annotations.dart.weak.expect

@@ -34,4 +34,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///type_variable_annotations.dart:
 - A. (from org-dartlang-testcase:///type_variable_annotations.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/type_variable_annotations.dart.weak.modular.expect b/pkg/front_end/testcases/general/type_variable_annotations.dart.weak.modular.expect
index 21c0f72..47a4bc8 100644
--- a/pkg/front_end/testcases/general/type_variable_annotations.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/type_variable_annotations.dart.weak.modular.expect

@@ -34,4 +34,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///type_variable_annotations.dart:
 - A. (from org-dartlang-testcase:///type_variable_annotations.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/type_variable_annotations.dart.weak.transformed.expect b/pkg/front_end/testcases/general/type_variable_annotations.dart.weak.transformed.expect
index 21c0f72..47a4bc8 100644
--- a/pkg/front_end/testcases/general/type_variable_annotations.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/type_variable_annotations.dart.weak.transformed.expect

@@ -34,4 +34,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///type_variable_annotations.dart:
 - A. (from org-dartlang-testcase:///type_variable_annotations.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/type_variable_in_static_context.dart.weak.expect b/pkg/front_end/testcases/general/type_variable_in_static_context.dart.weak.expect
index 9952b84..a3830e4f 100644
--- a/pkg/front_end/testcases/general/type_variable_in_static_context.dart.weak.expect
+++ b/pkg/front_end/testcases/general/type_variable_in_static_context.dart.weak.expect

@@ -623,4 +623,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///type_variable_in_static_context.dart:
 - Class. (from org-dartlang-testcase:///type_variable_in_static_context.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/type_variable_in_static_context.dart.weak.modular.expect b/pkg/front_end/testcases/general/type_variable_in_static_context.dart.weak.modular.expect
index 9952b84..a3830e4f 100644
--- a/pkg/front_end/testcases/general/type_variable_in_static_context.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/type_variable_in_static_context.dart.weak.modular.expect

@@ -623,4 +623,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///type_variable_in_static_context.dart:
 - Class. (from org-dartlang-testcase:///type_variable_in_static_context.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/type_variable_in_static_context.dart.weak.transformed.expect b/pkg/front_end/testcases/general/type_variable_in_static_context.dart.weak.transformed.expect
index 643a91f..68ce6ff 100644
--- a/pkg/front_end/testcases/general/type_variable_in_static_context.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/type_variable_in_static_context.dart.weak.transformed.expect

@@ -623,4 +623,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///type_variable_in_static_context.dart:
 - Class. (from org-dartlang-testcase:///type_variable_in_static_context.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/type_variable_uses.dart.weak.expect b/pkg/front_end/testcases/general/type_variable_uses.dart.weak.expect
index 62ddb4f..bab702d 100644
--- a/pkg/front_end/testcases/general/type_variable_uses.dart.weak.expect
+++ b/pkg/front_end/testcases/general/type_variable_uses.dart.weak.expect

@@ -109,4 +109,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///type_variable_uses.dart:
 - C. (from org-dartlang-testcase:///type_variable_uses.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/type_variable_uses.dart.weak.modular.expect b/pkg/front_end/testcases/general/type_variable_uses.dart.weak.modular.expect
index 62ddb4f..bab702d 100644
--- a/pkg/front_end/testcases/general/type_variable_uses.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/type_variable_uses.dart.weak.modular.expect

@@ -109,4 +109,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///type_variable_uses.dart:
 - C. (from org-dartlang-testcase:///type_variable_uses.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/type_variable_uses.dart.weak.transformed.expect b/pkg/front_end/testcases/general/type_variable_uses.dart.weak.transformed.expect
index 62ddb4f..bab702d 100644
--- a/pkg/front_end/testcases/general/type_variable_uses.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/type_variable_uses.dart.weak.transformed.expect

@@ -109,4 +109,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///type_variable_uses.dart:
 - C. (from org-dartlang-testcase:///type_variable_uses.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/typedef_annotation.dart.weak.expect b/pkg/front_end/testcases/general/typedef_annotation.dart.weak.expect
index 3c94843..2c49212 100644
--- a/pkg/front_end/testcases/general/typedef_annotation.dart.weak.expect
+++ b/pkg/front_end/testcases/general/typedef_annotation.dart.weak.expect

@@ -21,4 +21,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///typedef_annotation.dart:
 - A. (from org-dartlang-testcase:///typedef_annotation.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/typedef_annotation.dart.weak.modular.expect b/pkg/front_end/testcases/general/typedef_annotation.dart.weak.modular.expect
index 3c94843..2c49212 100644
--- a/pkg/front_end/testcases/general/typedef_annotation.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/typedef_annotation.dart.weak.modular.expect

@@ -21,4 +21,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///typedef_annotation.dart:
 - A. (from org-dartlang-testcase:///typedef_annotation.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/typedef_annotation.dart.weak.transformed.expect b/pkg/front_end/testcases/general/typedef_annotation.dart.weak.transformed.expect
index 3c94843..2c49212 100644
--- a/pkg/front_end/testcases/general/typedef_annotation.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/typedef_annotation.dart.weak.transformed.expect

@@ -21,4 +21,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///typedef_annotation.dart:
 - A. (from org-dartlang-testcase:///typedef_annotation.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/with_dependencies/issue43538/main.dart.weak.expect b/pkg/front_end/testcases/general/with_dependencies/issue43538/main.dart.weak.expect
index bb96ac5..e83891b 100644
--- a/pkg/front_end/testcases/general/with_dependencies/issue43538/main.dart.weak.expect
+++ b/pkg/front_end/testcases/general/with_dependencies/issue43538/main.dart.weak.expect

@@ -54,4 +54,4 @@
 - B. (from org-dartlang-testcase:///const_lib.dart:16:9)
 - _B&A&M. (from org-dartlang-testcase:///const_lib.dart:15:7)
 - A. (from org-dartlang-testcase:///const_lib.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/with_dependencies/issue43538/main.dart.weak.modular.expect b/pkg/front_end/testcases/general/with_dependencies/issue43538/main.dart.weak.modular.expect
index ba5a448..70dbb85 100644
--- a/pkg/front_end/testcases/general/with_dependencies/issue43538/main.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/with_dependencies/issue43538/main.dart.weak.modular.expect

@@ -27,4 +27,4 @@
 - B. (from org-dartlang-testcase:///const_lib.dart:16:9)
 - _B&A&M. (from org-dartlang-testcase:///const_lib.dart:15:7)
 - A. (from org-dartlang-testcase:///const_lib.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/general/with_dependencies/issue43538/main.dart.weak.transformed.expect b/pkg/front_end/testcases/general/with_dependencies/issue43538/main.dart.weak.transformed.expect
index bb96ac5..e83891b 100644
--- a/pkg/front_end/testcases/general/with_dependencies/issue43538/main.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/with_dependencies/issue43538/main.dart.weak.transformed.expect

@@ -54,4 +54,4 @@
 - B. (from org-dartlang-testcase:///const_lib.dart:16:9)
 - _B&A&M. (from org-dartlang-testcase:///const_lib.dart:15:7)
 - A. (from org-dartlang-testcase:///const_lib.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/generic_metadata/function_type_parameter.dart.strong.expect b/pkg/front_end/testcases/generic_metadata/function_type_parameter.dart.strong.expect
index 17eab83..7d9fca7 100644
--- a/pkg/front_end/testcases/generic_metadata/function_type_parameter.dart.strong.expect
+++ b/pkg/front_end/testcases/generic_metadata/function_type_parameter.dart.strong.expect

@@ -32,4 +32,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///function_type_parameter.dart:
 - A. (from org-dartlang-testcase:///function_type_parameter.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/generic_metadata/function_type_parameter.dart.strong.transformed.expect b/pkg/front_end/testcases/generic_metadata/function_type_parameter.dart.strong.transformed.expect
index 17eab83..7d9fca7 100644
--- a/pkg/front_end/testcases/generic_metadata/function_type_parameter.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/generic_metadata/function_type_parameter.dart.strong.transformed.expect

@@ -32,4 +32,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///function_type_parameter.dart:
 - A. (from org-dartlang-testcase:///function_type_parameter.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/generic_metadata/function_type_parameter.dart.weak.expect b/pkg/front_end/testcases/generic_metadata/function_type_parameter.dart.weak.expect
index d081a19..16cf05a 100644
--- a/pkg/front_end/testcases/generic_metadata/function_type_parameter.dart.weak.expect
+++ b/pkg/front_end/testcases/generic_metadata/function_type_parameter.dart.weak.expect

@@ -32,4 +32,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///function_type_parameter.dart:
 - A. (from org-dartlang-testcase:///function_type_parameter.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/generic_metadata/function_type_parameter.dart.weak.modular.expect b/pkg/front_end/testcases/generic_metadata/function_type_parameter.dart.weak.modular.expect
index d081a19..16cf05a 100644
--- a/pkg/front_end/testcases/generic_metadata/function_type_parameter.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/generic_metadata/function_type_parameter.dart.weak.modular.expect

@@ -32,4 +32,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///function_type_parameter.dart:
 - A. (from org-dartlang-testcase:///function_type_parameter.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/generic_metadata/function_type_parameter.dart.weak.transformed.expect b/pkg/front_end/testcases/generic_metadata/function_type_parameter.dart.weak.transformed.expect
index d081a19..16cf05a 100644
--- a/pkg/front_end/testcases/generic_metadata/function_type_parameter.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/generic_metadata/function_type_parameter.dart.weak.transformed.expect

@@ -32,4 +32,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///function_type_parameter.dart:
 - A. (from org-dartlang-testcase:///function_type_parameter.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/generic_metadata/generic_metadata.dart.strong.expect b/pkg/front_end/testcases/generic_metadata/generic_metadata.dart.strong.expect
index 0054d6c..d5314f6 100644
--- a/pkg/front_end/testcases/generic_metadata/generic_metadata.dart.strong.expect
+++ b/pkg/front_end/testcases/generic_metadata/generic_metadata.dart.strong.expect

@@ -93,7 +93,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///generic_metadata.dart:
 - C. (from org-dartlang-testcase:///generic_metadata.dart:14:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - D. (from org-dartlang-testcase:///generic_metadata.dart:18:9)
 - A. (from org-dartlang-testcase:///generic_metadata.dart:6:9)
 - B. (from org-dartlang-testcase:///generic_metadata.dart:10:9)

diff --git a/pkg/front_end/testcases/generic_metadata/generic_metadata.dart.strong.transformed.expect b/pkg/front_end/testcases/generic_metadata/generic_metadata.dart.strong.transformed.expect
index 0054d6c..d5314f6 100644
--- a/pkg/front_end/testcases/generic_metadata/generic_metadata.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/generic_metadata/generic_metadata.dart.strong.transformed.expect

@@ -93,7 +93,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///generic_metadata.dart:
 - C. (from org-dartlang-testcase:///generic_metadata.dart:14:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - D. (from org-dartlang-testcase:///generic_metadata.dart:18:9)
 - A. (from org-dartlang-testcase:///generic_metadata.dart:6:9)
 - B. (from org-dartlang-testcase:///generic_metadata.dart:10:9)

diff --git a/pkg/front_end/testcases/generic_metadata/generic_metadata.dart.weak.expect b/pkg/front_end/testcases/generic_metadata/generic_metadata.dart.weak.expect
index b60d2ce..416eed5 100644
--- a/pkg/front_end/testcases/generic_metadata/generic_metadata.dart.weak.expect
+++ b/pkg/front_end/testcases/generic_metadata/generic_metadata.dart.weak.expect

@@ -93,7 +93,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///generic_metadata.dart:
 - C. (from org-dartlang-testcase:///generic_metadata.dart:14:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - D. (from org-dartlang-testcase:///generic_metadata.dart:18:9)
 - A. (from org-dartlang-testcase:///generic_metadata.dart:6:9)
 - B. (from org-dartlang-testcase:///generic_metadata.dart:10:9)

diff --git a/pkg/front_end/testcases/generic_metadata/generic_metadata.dart.weak.modular.expect b/pkg/front_end/testcases/generic_metadata/generic_metadata.dart.weak.modular.expect
index b60d2ce..416eed5 100644
--- a/pkg/front_end/testcases/generic_metadata/generic_metadata.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/generic_metadata/generic_metadata.dart.weak.modular.expect

@@ -93,7 +93,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///generic_metadata.dart:
 - C. (from org-dartlang-testcase:///generic_metadata.dart:14:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - D. (from org-dartlang-testcase:///generic_metadata.dart:18:9)
 - A. (from org-dartlang-testcase:///generic_metadata.dart:6:9)
 - B. (from org-dartlang-testcase:///generic_metadata.dart:10:9)

diff --git a/pkg/front_end/testcases/generic_metadata/generic_metadata.dart.weak.transformed.expect b/pkg/front_end/testcases/generic_metadata/generic_metadata.dart.weak.transformed.expect
index b60d2ce..416eed5 100644
--- a/pkg/front_end/testcases/generic_metadata/generic_metadata.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/generic_metadata/generic_metadata.dart.weak.transformed.expect

@@ -93,7 +93,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///generic_metadata.dart:
 - C. (from org-dartlang-testcase:///generic_metadata.dart:14:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - D. (from org-dartlang-testcase:///generic_metadata.dart:18:9)
 - A. (from org-dartlang-testcase:///generic_metadata.dart:6:9)
 - B. (from org-dartlang-testcase:///generic_metadata.dart:10:9)

diff --git a/pkg/front_end/testcases/incremental/changed_serialization_2.yaml.world.1.expect b/pkg/front_end/testcases/incremental/changed_serialization_2.yaml.world.1.expect
index 2f204b3..d58b141 100644
--- a/pkg/front_end/testcases/incremental/changed_serialization_2.yaml.world.1.expect
+++ b/pkg/front_end/testcases/incremental/changed_serialization_2.yaml.world.1.expect

@@ -35,9 +35,9 @@
 org-dartlang-test:///main.dart:
 - C. (from org-dartlang-test:///lib.dart:10:9)
 - B. (from org-dartlang-test:///lib.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 org-dartlang-test:///lib.dart:
 - A. (from org-dartlang-test:///lib.dart:2:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/changed_serialization_2.yaml.world.2.expect b/pkg/front_end/testcases/incremental/changed_serialization_2.yaml.world.2.expect
index 15ba313..f23683d 100644
--- a/pkg/front_end/testcases/incremental/changed_serialization_2.yaml.world.2.expect
+++ b/pkg/front_end/testcases/incremental/changed_serialization_2.yaml.world.2.expect

@@ -30,5 +30,5 @@
 Constructor coverage from constants:
 org-dartlang-test:///lib.dart:
 - A. (from org-dartlang-test:///lib.dart:2:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/const_to_string.yaml.world.1.expect b/pkg/front_end/testcases/incremental/const_to_string.yaml.world.1.expect
index fc57f00..7269277 100644
--- a/pkg/front_end/testcases/incremental/const_to_string.yaml.world.1.expect
+++ b/pkg/front_end/testcases/incremental/const_to_string.yaml.world.1.expect

@@ -36,6 +36,6 @@
 Constructor coverage from constants:
 org-dartlang-test:///main.dart:
 - A. (from org-dartlang-test:///a.dart:2:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - B. (from org-dartlang-test:///b.dart:2:9)
 

diff --git a/pkg/front_end/testcases/incremental/const_to_string.yaml.world.2.expect b/pkg/front_end/testcases/incremental/const_to_string.yaml.world.2.expect
index fc57f00..7269277 100644
--- a/pkg/front_end/testcases/incremental/const_to_string.yaml.world.2.expect
+++ b/pkg/front_end/testcases/incremental/const_to_string.yaml.world.2.expect

@@ -36,6 +36,6 @@
 Constructor coverage from constants:
 org-dartlang-test:///main.dart:
 - A. (from org-dartlang-test:///a.dart:2:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - B. (from org-dartlang-test:///b.dart:2:9)
 

diff --git a/pkg/front_end/testcases/incremental/crash_05.yaml.world.1.expect b/pkg/front_end/testcases/incremental/crash_05.yaml.world.1.expect
index 04e1b36..b04e75e 100644
--- a/pkg/front_end/testcases/incremental/crash_05.yaml.world.1.expect
+++ b/pkg/front_end/testcases/incremental/crash_05.yaml.world.1.expect

@@ -70,8 +70,8 @@
 
 Constructor coverage from constants:
 org-dartlang-test:///lib.dart:
-- Uint32. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:91:9)
-- _NativeInteger. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:27:9)
-- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Uint32. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- _NativeInteger. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/crash_05.yaml.world.2.expect b/pkg/front_end/testcases/incremental/crash_05.yaml.world.2.expect
index 04e1b36..b04e75e 100644
--- a/pkg/front_end/testcases/incremental/crash_05.yaml.world.2.expect
+++ b/pkg/front_end/testcases/incremental/crash_05.yaml.world.2.expect

@@ -70,8 +70,8 @@
 
 Constructor coverage from constants:
 org-dartlang-test:///lib.dart:
-- Uint32. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:91:9)
-- _NativeInteger. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:27:9)
-- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Uint32. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- _NativeInteger. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/ffi_01.yaml.world.1.expect b/pkg/front_end/testcases/incremental/ffi_01.yaml.world.1.expect
index f8e1774..d1b1931 100644
--- a/pkg/front_end/testcases/incremental/ffi_01.yaml.world.1.expect
+++ b/pkg/front_end/testcases/incremental/ffi_01.yaml.world.1.expect

@@ -68,8 +68,8 @@
 
 Constructor coverage from constants:
 org-dartlang-test:///lib.dart:
-- Double. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:115:9)
-- _NativeDouble. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:35:9)
-- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Double. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- _NativeDouble. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/ffi_01.yaml.world.2.expect b/pkg/front_end/testcases/incremental/ffi_01.yaml.world.2.expect
index 4ac553a..49f33eb 100644
--- a/pkg/front_end/testcases/incremental/ffi_01.yaml.world.2.expect
+++ b/pkg/front_end/testcases/incremental/ffi_01.yaml.world.2.expect

@@ -72,8 +72,8 @@
 
 Constructor coverage from constants:
 org-dartlang-test:///lib.dart:
-- Double. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:115:9)
-- _NativeDouble. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:35:9)
-- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Double. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- _NativeDouble. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/ffi_02.yaml.world.1.expect b/pkg/front_end/testcases/incremental/ffi_02.yaml.world.1.expect
index 01043ea..ea17b40 100644
--- a/pkg/front_end/testcases/incremental/ffi_02.yaml.world.1.expect
+++ b/pkg/front_end/testcases/incremental/ffi_02.yaml.world.1.expect

@@ -69,8 +69,8 @@
 
 Constructor coverage from constants:
 org-dartlang-test:///lib.dart:
-- Double. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:115:9)
-- _NativeDouble. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:35:9)
-- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Double. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- _NativeDouble. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/flutter_widget_transform.yaml.world.1.expect b/pkg/front_end/testcases/incremental/flutter_widget_transform.yaml.world.1.expect
index 82bfff9..1861146 100644
--- a/pkg/front_end/testcases/incremental/flutter_widget_transform.yaml.world.1.expect
+++ b/pkg/front_end/testcases/incremental/flutter_widget_transform.yaml.world.1.expect

@@ -60,5 +60,5 @@
 Constructor coverage from constants:
 org-dartlang-test:///main.dart:
 - _Location. (from org-dartlang-test:///flutter/lib/src/widgets/widget_inspector.dart:8:9)
-- Object. (from org-dartlang-sdk:///lib/core/object.dart:-1:-1)
+- Object. (from org-dartlang-sdk:///lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/flutter_widget_transform.yaml.world.2.expect b/pkg/front_end/testcases/incremental/flutter_widget_transform.yaml.world.2.expect
index 82bfff9..1861146 100644
--- a/pkg/front_end/testcases/incremental/flutter_widget_transform.yaml.world.2.expect
+++ b/pkg/front_end/testcases/incremental/flutter_widget_transform.yaml.world.2.expect

@@ -60,5 +60,5 @@
 Constructor coverage from constants:
 org-dartlang-test:///main.dart:
 - _Location. (from org-dartlang-test:///flutter/lib/src/widgets/widget_inspector.dart:8:9)
-- Object. (from org-dartlang-sdk:///lib/core/object.dart:-1:-1)
+- Object. (from org-dartlang-sdk:///lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/flutter_widget_transform_const.yaml.world.1.expect b/pkg/front_end/testcases/incremental/flutter_widget_transform_const.yaml.world.1.expect
index 6347d3f6..fbd7bd3 100644
--- a/pkg/front_end/testcases/incremental/flutter_widget_transform_const.yaml.world.1.expect
+++ b/pkg/front_end/testcases/incremental/flutter_widget_transform_const.yaml.world.1.expect

@@ -162,14 +162,14 @@
 Constructor coverage from constants:
 org-dartlang-test:///main.dart:
 - _Location. (from org-dartlang-test:///flutter/lib/src/widgets/widget_inspector.dart:7:9)
-- Object. (from org-dartlang-sdk:///lib/core/object.dart:-1:-1)
+- Object. (from org-dartlang-sdk:///lib/core/object.dart)
 - Bar._ (from org-dartlang-test:///foo.dart:5:7)
 - Widget. (from org-dartlang-test:///flutter/lib/src/widgets/framework.dart:5:9)
 - Bar. (from org-dartlang-test:///flutter/lib/src/widgets/framework.dart:2:9)
 
 org-dartlang-test:///foo.dart:
 - _Location. (from org-dartlang-test:///flutter/lib/src/widgets/widget_inspector.dart:7:9)
-- Object. (from org-dartlang-sdk:///lib/core/object.dart:-1:-1)
+- Object. (from org-dartlang-sdk:///lib/core/object.dart)
 - Foo._ (from org-dartlang-test:///foo.dart:3:7)
 - Widget. (from org-dartlang-test:///flutter/lib/src/widgets/framework.dart:5:9)
 - Bar. (from org-dartlang-test:///flutter/lib/src/widgets/framework.dart:2:9)

diff --git a/pkg/front_end/testcases/incremental/flutter_widget_transform_const.yaml.world.2.expect b/pkg/front_end/testcases/incremental/flutter_widget_transform_const.yaml.world.2.expect
index 47f4225..347a860 100644
--- a/pkg/front_end/testcases/incremental/flutter_widget_transform_const.yaml.world.2.expect
+++ b/pkg/front_end/testcases/incremental/flutter_widget_transform_const.yaml.world.2.expect

@@ -145,7 +145,7 @@
 Constructor coverage from constants:
 org-dartlang-test:///foo.dart:
 - _Location. (from org-dartlang-test:///flutter/lib/src/widgets/widget_inspector.dart:7:9)
-- Object. (from org-dartlang-sdk:///lib/core/object.dart:-1:-1)
+- Object. (from org-dartlang-sdk:///lib/core/object.dart)
 - Foo._ (from org-dartlang-test:///foo.dart:3:7)
 - Widget. (from org-dartlang-test:///flutter/lib/src/widgets/framework.dart:5:9)
 - Bar. (from org-dartlang-test:///flutter/lib/src/widgets/framework.dart:2:9)

diff --git a/pkg/front_end/testcases/incremental/flutter_widget_transform_const.yaml.world.3.expect b/pkg/front_end/testcases/incremental/flutter_widget_transform_const.yaml.world.3.expect
index a2b9291..f9bc170 100644
--- a/pkg/front_end/testcases/incremental/flutter_widget_transform_const.yaml.world.3.expect
+++ b/pkg/front_end/testcases/incremental/flutter_widget_transform_const.yaml.world.3.expect

@@ -162,7 +162,7 @@
 Constructor coverage from constants:
 org-dartlang-test:///foo.dart:
 - _Location. (from org-dartlang-test:///flutter/lib/src/widgets/widget_inspector.dart:7:9)
-- Object. (from org-dartlang-sdk:///lib/core/object.dart:-1:-1)
+- Object. (from org-dartlang-sdk:///lib/core/object.dart)
 - Foo._ (from org-dartlang-test:///foo.dart:3:7)
 - Widget. (from org-dartlang-test:///flutter/lib/src/widgets/framework.dart:5:9)
 - Bar. (from org-dartlang-test:///flutter/lib/src/widgets/framework.dart:2:9)
@@ -171,7 +171,7 @@
 
 org-dartlang-test:///main.dart:
 - _Location. (from org-dartlang-test:///flutter/lib/src/widgets/widget_inspector.dart:7:9)
-- Object. (from org-dartlang-sdk:///lib/core/object.dart:-1:-1)
+- Object. (from org-dartlang-sdk:///lib/core/object.dart)
 - Bar._ (from org-dartlang-test:///foo.dart:5:7)
 - Widget. (from org-dartlang-test:///flutter/lib/src/widgets/framework.dart:5:9)
 - Bar. (from org-dartlang-test:///flutter/lib/src/widgets/framework.dart:2:9)

diff --git a/pkg/front_end/testcases/incremental/flutter_widget_transform_nnbd.yaml.world.1.expect b/pkg/front_end/testcases/incremental/flutter_widget_transform_nnbd.yaml.world.1.expect
index 9227139..13c5c71 100644
--- a/pkg/front_end/testcases/incremental/flutter_widget_transform_nnbd.yaml.world.1.expect
+++ b/pkg/front_end/testcases/incremental/flutter_widget_transform_nnbd.yaml.world.1.expect

@@ -65,5 +65,5 @@
 Constructor coverage from constants:
 org-dartlang-test:///foo.dart:
 - _Location. (from org-dartlang-test:///flutter/lib/src/widgets/widget_inspector.dart:8:9)
-- Object. (from org-dartlang-sdk:///lib/core/object.dart:-1:-1)
+- Object. (from org-dartlang-sdk:///lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/flutter_widget_transform_nnbd.yaml.world.2.expect b/pkg/front_end/testcases/incremental/flutter_widget_transform_nnbd.yaml.world.2.expect
index b970314..fe87b1a 100644
--- a/pkg/front_end/testcases/incremental/flutter_widget_transform_nnbd.yaml.world.2.expect
+++ b/pkg/front_end/testcases/incremental/flutter_widget_transform_nnbd.yaml.world.2.expect

@@ -71,11 +71,11 @@
 Constructor coverage from constants:
 org-dartlang-test:///foo.dart:
 - _Location. (from org-dartlang-test:///flutter/lib/src/widgets/widget_inspector.dart:8:9)
-- Object. (from org-dartlang-sdk:///lib/core/object.dart:-1:-1)
+- Object. (from org-dartlang-sdk:///lib/core/object.dart)
 
 org-dartlang-test:///main.dart:
 - _Location. (from org-dartlang-test:///flutter/lib/src/widgets/widget_inspector.dart:8:9)
-- Object. (from org-dartlang-sdk:///lib/core/object.dart:-1:-1)
+- Object. (from org-dartlang-sdk:///lib/core/object.dart)
 - Foo. (from org-dartlang-test:///foo.dart:2:34)
 - Widget. (from org-dartlang-test:///flutter/lib/src/widgets/framework.dart:6:9)
 - Bar. (from org-dartlang-test:///flutter/lib/src/widgets/framework.dart:2:9)

diff --git a/pkg/front_end/testcases/incremental/flutter_widget_transformer_43371.yaml.world.2.expect b/pkg/front_end/testcases/incremental/flutter_widget_transformer_43371.yaml.world.2.expect
index 4d8c8bd..7d63f2b 100644
--- a/pkg/front_end/testcases/incremental/flutter_widget_transformer_43371.yaml.world.2.expect
+++ b/pkg/front_end/testcases/incremental/flutter_widget_transformer_43371.yaml.world.2.expect

@@ -77,5 +77,5 @@
 - StatelessWidget. (from org-dartlang-test:///flutter/lib/src/widgets/framework.dart:10:9)
 - Widget. (from org-dartlang-test:///flutter/lib/src/widgets/framework.dart:7:9)
 - Bar. (from org-dartlang-test:///flutter/lib/src/widgets/framework.dart:2:9)
-- Object. (from org-dartlang-sdk:///lib/core/object.dart:-1:-1)
+- Object. (from org-dartlang-sdk:///lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/flutter_widget_transformer_non_const.yaml.world.1.expect b/pkg/front_end/testcases/incremental/flutter_widget_transformer_non_const.yaml.world.1.expect
index 02db06b..c0a2db9 100644
--- a/pkg/front_end/testcases/incremental/flutter_widget_transformer_non_const.yaml.world.1.expect
+++ b/pkg/front_end/testcases/incremental/flutter_widget_transformer_non_const.yaml.world.1.expect

@@ -66,5 +66,5 @@
 Constructor coverage from constants:
 org-dartlang-test:///foo.dart:
 - _Location. (from org-dartlang-test:///flutter/lib/src/widgets/widget_inspector.dart:7:9)
-- Object. (from org-dartlang-sdk:///lib/core/object.dart:-1:-1)
+- Object. (from org-dartlang-sdk:///lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/flutter_widget_transformer_non_const.yaml.world.2.expect b/pkg/front_end/testcases/incremental/flutter_widget_transformer_non_const.yaml.world.2.expect
index 292e661..a238bef 100644
--- a/pkg/front_end/testcases/incremental/flutter_widget_transformer_non_const.yaml.world.2.expect
+++ b/pkg/front_end/testcases/incremental/flutter_widget_transformer_non_const.yaml.world.2.expect

@@ -71,9 +71,9 @@
 Constructor coverage from constants:
 org-dartlang-test:///foo.dart:
 - _Location. (from org-dartlang-test:///flutter/lib/src/widgets/widget_inspector.dart:7:9)
-- Object. (from org-dartlang-sdk:///lib/core/object.dart:-1:-1)
+- Object. (from org-dartlang-sdk:///lib/core/object.dart)
 
 org-dartlang-test:///main.dart:
 - _Location. (from org-dartlang-test:///flutter/lib/src/widgets/widget_inspector.dart:7:9)
-- Object. (from org-dartlang-sdk:///lib/core/object.dart:-1:-1)
+- Object. (from org-dartlang-sdk:///lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/issue_46666.yaml.world.1.expect b/pkg/front_end/testcases/incremental/issue_46666.yaml.world.1.expect
index 2b8f16d..e20de8a 100644
--- a/pkg/front_end/testcases/incremental/issue_46666.yaml.world.1.expect
+++ b/pkg/front_end/testcases/incremental/issue_46666.yaml.world.1.expect

@@ -128,7 +128,7 @@
 
 Constructor coverage from constants:
 org-dartlang-test:///b.dart:
-- Duration. (from org-dartlang-sdk:///sdk/lib/core/duration.dart:173:9)
-- Duration._microseconds (from org-dartlang-sdk:///sdk/lib/core/duration.dart:189:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Duration. (from org-dartlang-sdk:///sdk/lib/core/duration.dart)
+- Duration._microseconds (from org-dartlang-sdk:///sdk/lib/core/duration.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/issue_46666.yaml.world.2.expect b/pkg/front_end/testcases/incremental/issue_46666.yaml.world.2.expect
index 2b8f16d..e20de8a 100644
--- a/pkg/front_end/testcases/incremental/issue_46666.yaml.world.2.expect
+++ b/pkg/front_end/testcases/incremental/issue_46666.yaml.world.2.expect

@@ -128,7 +128,7 @@
 
 Constructor coverage from constants:
 org-dartlang-test:///b.dart:
-- Duration. (from org-dartlang-sdk:///sdk/lib/core/duration.dart:173:9)
-- Duration._microseconds (from org-dartlang-sdk:///sdk/lib/core/duration.dart:189:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Duration. (from org-dartlang-sdk:///sdk/lib/core/duration.dart)
+- Duration._microseconds (from org-dartlang-sdk:///sdk/lib/core/duration.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/no_outline_change_13.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_13.yaml.world.1.expect
index fa8de36..847e3a1 100644
--- a/pkg/front_end/testcases/incremental/no_outline_change_13.yaml.world.1.expect
+++ b/pkg/front_end/testcases/incremental/no_outline_change_13.yaml.world.1.expect

@@ -31,5 +31,5 @@
 Constructor coverage from constants:
 org-dartlang-test:///lib2.dart:
 - Foo. (from org-dartlang-test:///lib2.dart:3:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/no_outline_change_13.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_13.yaml.world.2.expect
index a2b3ee6..d99aead 100644
--- a/pkg/front_end/testcases/incremental/no_outline_change_13.yaml.world.2.expect
+++ b/pkg/front_end/testcases/incremental/no_outline_change_13.yaml.world.2.expect

@@ -32,5 +32,5 @@
 Constructor coverage from constants:
 org-dartlang-test:///lib2.dart:
 - Foo. (from org-dartlang-test:///lib2.dart:3:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/no_outline_change_2.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_2.yaml.world.1.expect
index 98b6020..956c86d 100644
--- a/pkg/front_end/testcases/incremental/no_outline_change_2.yaml.world.1.expect
+++ b/pkg/front_end/testcases/incremental/no_outline_change_2.yaml.world.1.expect

@@ -61,6 +61,6 @@
 Constructor coverage from constants:
 org-dartlang-test:///main.dart:
 - CompilationStrategy. (from org-dartlang-test:///main.dart:17:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/no_outline_change_2.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_2.yaml.world.2.expect
index 62d9697..a2c3e72 100644
--- a/pkg/front_end/testcases/incremental/no_outline_change_2.yaml.world.2.expect
+++ b/pkg/front_end/testcases/incremental/no_outline_change_2.yaml.world.2.expect

@@ -61,6 +61,6 @@
 Constructor coverage from constants:
 org-dartlang-test:///main.dart:
 - CompilationStrategy. (from org-dartlang-test:///main.dart:17:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/no_outline_change_3.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_3.yaml.world.1.expect
index b512f86..96b2d91 100644
--- a/pkg/front_end/testcases/incremental/no_outline_change_3.yaml.world.1.expect
+++ b/pkg/front_end/testcases/incremental/no_outline_change_3.yaml.world.1.expect

@@ -32,5 +32,5 @@
 Constructor coverage from constants:
 org-dartlang-test:///main.dart:
 - Foo. (from org-dartlang-test:///main.dart:4:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/no_outline_change_3.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_3.yaml.world.2.expect
index 7d4f754..86dfec2 100644
--- a/pkg/front_end/testcases/incremental/no_outline_change_3.yaml.world.2.expect
+++ b/pkg/front_end/testcases/incremental/no_outline_change_3.yaml.world.2.expect

@@ -33,5 +33,5 @@
 Constructor coverage from constants:
 org-dartlang-test:///main.dart:
 - Foo. (from org-dartlang-test:///main.dart:4:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/no_outline_change_35.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_35.yaml.world.1.expect
index 1cde8e9..7287c0d 100644
--- a/pkg/front_end/testcases/incremental/no_outline_change_35.yaml.world.1.expect
+++ b/pkg/front_end/testcases/incremental/no_outline_change_35.yaml.world.1.expect

@@ -68,8 +68,8 @@
 
 Constructor coverage from constants:
 org-dartlang-test:///lib.dart:
-- Double. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:115:9)
-- _NativeDouble. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:35:9)
-- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Double. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- _NativeDouble. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/no_outline_change_35.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_35.yaml.world.2.expect
index 7d35a3d..32fbe88 100644
--- a/pkg/front_end/testcases/incremental/no_outline_change_35.yaml.world.2.expect
+++ b/pkg/front_end/testcases/incremental/no_outline_change_35.yaml.world.2.expect

@@ -69,8 +69,8 @@
 
 Constructor coverage from constants:
 org-dartlang-test:///lib.dart:
-- Double. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:115:9)
-- _NativeDouble. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:35:9)
-- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Double. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- _NativeDouble. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/no_outline_change_35.yaml.world.3.expect b/pkg/front_end/testcases/incremental/no_outline_change_35.yaml.world.3.expect
index 41ed258..b39e8d7 100644
--- a/pkg/front_end/testcases/incremental/no_outline_change_35.yaml.world.3.expect
+++ b/pkg/front_end/testcases/incremental/no_outline_change_35.yaml.world.3.expect

@@ -70,8 +70,8 @@
 
 Constructor coverage from constants:
 org-dartlang-test:///lib.dart:
-- Double. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:115:9)
-- _NativeDouble. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:35:9)
-- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Double. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- _NativeDouble. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/no_outline_change_48_ffi.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_48_ffi.yaml.world.1.expect
index d73f0fe..d396422 100644
--- a/pkg/front_end/testcases/incremental/no_outline_change_48_ffi.yaml.world.1.expect
+++ b/pkg/front_end/testcases/incremental/no_outline_change_48_ffi.yaml.world.1.expect

@@ -109,15 +109,15 @@
 
 Constructor coverage from constants:
 org-dartlang-test:///main.dart:
-- Uint8. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:75:9)
-- _NativeInteger. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:27:9)
-- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Uint8. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- _NativeInteger. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 org-dartlang-test:///lib.dart:
-- Uint8. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:75:9)
-- _NativeInteger. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:27:9)
-- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
-- Uint64. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:99:9)
+- Uint8. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- _NativeInteger. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
+- Uint64. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
 

diff --git a/pkg/front_end/testcases/incremental/no_outline_change_48_ffi.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_48_ffi.yaml.world.2.expect
index 2f12464..b8a46b9 100644
--- a/pkg/front_end/testcases/incremental/no_outline_change_48_ffi.yaml.world.2.expect
+++ b/pkg/front_end/testcases/incremental/no_outline_change_48_ffi.yaml.world.2.expect

@@ -109,15 +109,15 @@
 
 Constructor coverage from constants:
 org-dartlang-test:///main.dart:
-- Uint8. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:75:9)
-- _NativeInteger. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:27:9)
-- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Uint8. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- _NativeInteger. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 org-dartlang-test:///lib.dart:
-- Uint8. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:75:9)
-- _NativeInteger. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:27:9)
-- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
-- Uint64. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:99:9)
+- Uint8. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- _NativeInteger. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
+- Uint64. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
 

diff --git a/pkg/front_end/testcases/incremental/no_outline_change_49_ffi.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_49_ffi.yaml.world.1.expect
index d73f0fe..d396422 100644
--- a/pkg/front_end/testcases/incremental/no_outline_change_49_ffi.yaml.world.1.expect
+++ b/pkg/front_end/testcases/incremental/no_outline_change_49_ffi.yaml.world.1.expect

@@ -109,15 +109,15 @@
 
 Constructor coverage from constants:
 org-dartlang-test:///main.dart:
-- Uint8. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:75:9)
-- _NativeInteger. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:27:9)
-- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Uint8. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- _NativeInteger. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 org-dartlang-test:///lib.dart:
-- Uint8. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:75:9)
-- _NativeInteger. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:27:9)
-- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
-- Uint64. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:99:9)
+- Uint8. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- _NativeInteger. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
+- Uint64. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
 

diff --git a/pkg/front_end/testcases/incremental/no_outline_change_49_ffi.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_49_ffi.yaml.world.2.expect
index 2f12464..b8a46b9 100644
--- a/pkg/front_end/testcases/incremental/no_outline_change_49_ffi.yaml.world.2.expect
+++ b/pkg/front_end/testcases/incremental/no_outline_change_49_ffi.yaml.world.2.expect

@@ -109,15 +109,15 @@
 
 Constructor coverage from constants:
 org-dartlang-test:///main.dart:
-- Uint8. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:75:9)
-- _NativeInteger. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:27:9)
-- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Uint8. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- _NativeInteger. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 org-dartlang-test:///lib.dart:
-- Uint8. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:75:9)
-- _NativeInteger. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:27:9)
-- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
-- Uint64. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:99:9)
+- Uint8. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- _NativeInteger. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
+- Uint64. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
 

diff --git a/pkg/front_end/testcases/incremental/no_outline_change_5.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_5.yaml.world.1.expect
index 219336f..52a93fb 100644
--- a/pkg/front_end/testcases/incremental/no_outline_change_5.yaml.world.1.expect
+++ b/pkg/front_end/testcases/incremental/no_outline_change_5.yaml.world.1.expect

@@ -28,5 +28,5 @@
 Constructor coverage from constants:
 org-dartlang-test:///main.dart:
 - Foo. (from org-dartlang-test:///main.dart:4:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/no_outline_change_5.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_5.yaml.world.2.expect
index 0b6947c..9d230d9 100644
--- a/pkg/front_end/testcases/incremental/no_outline_change_5.yaml.world.2.expect
+++ b/pkg/front_end/testcases/incremental/no_outline_change_5.yaml.world.2.expect

@@ -28,5 +28,5 @@
 Constructor coverage from constants:
 org-dartlang-test:///main.dart:
 - Foo. (from org-dartlang-test:///main.dart:4:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/no_outline_change_5.yaml.world.3.expect b/pkg/front_end/testcases/incremental/no_outline_change_5.yaml.world.3.expect
index dca8b6c..34920d9 100644
--- a/pkg/front_end/testcases/incremental/no_outline_change_5.yaml.world.3.expect
+++ b/pkg/front_end/testcases/incremental/no_outline_change_5.yaml.world.3.expect

@@ -29,5 +29,5 @@
 Constructor coverage from constants:
 org-dartlang-test:///main.dart:
 - Foo. (from org-dartlang-test:///main.dart:4:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/no_outline_change_50_ffi.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_50_ffi.yaml.world.1.expect
index 3285a00..5be1bbe 100644
--- a/pkg/front_end/testcases/incremental/no_outline_change_50_ffi.yaml.world.1.expect
+++ b/pkg/front_end/testcases/incremental/no_outline_change_50_ffi.yaml.world.1.expect

@@ -295,15 +295,15 @@
 
 Constructor coverage from constants:
 org-dartlang-test:///main.dart:
-- Uint8. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:75:9)
-- _NativeInteger. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:27:9)
-- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Uint8. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- _NativeInteger. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 org-dartlang-test:///lib.dart:
-- Uint8. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:75:9)
-- _NativeInteger. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:27:9)
-- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
-- Uint64. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:99:9)
+- Uint8. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- _NativeInteger. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
+- Uint64. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
 

diff --git a/pkg/front_end/testcases/incremental/no_outline_change_50_ffi.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_50_ffi.yaml.world.2.expect
index ef80737..ccecf01 100644
--- a/pkg/front_end/testcases/incremental/no_outline_change_50_ffi.yaml.world.2.expect
+++ b/pkg/front_end/testcases/incremental/no_outline_change_50_ffi.yaml.world.2.expect

@@ -295,15 +295,15 @@
 
 Constructor coverage from constants:
 org-dartlang-test:///main.dart:
-- Uint8. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:75:9)
-- _NativeInteger. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:27:9)
-- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Uint8. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- _NativeInteger. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 org-dartlang-test:///lib.dart:
-- Uint8. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:75:9)
-- _NativeInteger. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:27:9)
-- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
-- Uint64. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:99:9)
+- Uint8. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- _NativeInteger. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
+- Uint64. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
 

diff --git a/pkg/front_end/testcases/incremental/no_outline_change_6.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_6.yaml.world.1.expect
index c4930d6..553edaa 100644
--- a/pkg/front_end/testcases/incremental/no_outline_change_6.yaml.world.1.expect
+++ b/pkg/front_end/testcases/incremental/no_outline_change_6.yaml.world.1.expect

@@ -68,6 +68,6 @@
 Constructor coverage from constants:
 org-dartlang-test:///main.dart:
 - CompilationStrategy. (from org-dartlang-test:///main.dart:17:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/no_outline_change_6.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_6.yaml.world.2.expect
index 82b26f6..036a026 100644
--- a/pkg/front_end/testcases/incremental/no_outline_change_6.yaml.world.2.expect
+++ b/pkg/front_end/testcases/incremental/no_outline_change_6.yaml.world.2.expect

@@ -68,6 +68,6 @@
 Constructor coverage from constants:
 org-dartlang-test:///main.dart:
 - CompilationStrategy. (from org-dartlang-test:///main.dart:17:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/no_outline_change_6.yaml.world.3.expect b/pkg/front_end/testcases/incremental/no_outline_change_6.yaml.world.3.expect
index 0e56202..9ef101c 100644
--- a/pkg/front_end/testcases/incremental/no_outline_change_6.yaml.world.3.expect
+++ b/pkg/front_end/testcases/incremental/no_outline_change_6.yaml.world.3.expect

@@ -61,6 +61,6 @@
 Constructor coverage from constants:
 org-dartlang-test:///main.dart:
 - CompilationStrategy. (from org-dartlang-test:///main.dart:17:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/no_outline_change_7.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_7.yaml.world.1.expect
index 94a4917..0d30724 100644
--- a/pkg/front_end/testcases/incremental/no_outline_change_7.yaml.world.1.expect
+++ b/pkg/front_end/testcases/incremental/no_outline_change_7.yaml.world.1.expect

@@ -79,6 +79,6 @@
 Constructor coverage from constants:
 org-dartlang-test:///main.dart:
 - CompilationStrategy. (from org-dartlang-test:///main.dart:32:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/no_outline_change_7.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_7.yaml.world.2.expect
index 94a4917..0d30724 100644
--- a/pkg/front_end/testcases/incremental/no_outline_change_7.yaml.world.2.expect
+++ b/pkg/front_end/testcases/incremental/no_outline_change_7.yaml.world.2.expect

@@ -79,6 +79,6 @@
 Constructor coverage from constants:
 org-dartlang-test:///main.dart:
 - CompilationStrategy. (from org-dartlang-test:///main.dart:32:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/reissue_errors_10.yaml.world.3.expect b/pkg/front_end/testcases/incremental/reissue_errors_10.yaml.world.3.expect
index 633f67f..93d85d1 100644
--- a/pkg/front_end/testcases/incremental/reissue_errors_10.yaml.world.3.expect
+++ b/pkg/front_end/testcases/incremental/reissue_errors_10.yaml.world.3.expect

@@ -57,5 +57,5 @@
 
 org-dartlang-test:///lib2.dart:
 - Foo. (from org-dartlang-test:///lib.dart:2:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/reissue_errors_10.yaml.world.4.expect b/pkg/front_end/testcases/incremental/reissue_errors_10.yaml.world.4.expect
index 5f792dc..3e6a4f4 100644
--- a/pkg/front_end/testcases/incremental/reissue_errors_10.yaml.world.4.expect
+++ b/pkg/front_end/testcases/incremental/reissue_errors_10.yaml.world.4.expect

@@ -57,5 +57,5 @@
 
 org-dartlang-test:///lib3.dart:
 - Foo. (from org-dartlang-test:///lib.dart:2:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/reissue_errors_10.yaml.world.5.expect b/pkg/front_end/testcases/incremental/reissue_errors_10.yaml.world.5.expect
index 828d380..00947da 100644
--- a/pkg/front_end/testcases/incremental/reissue_errors_10.yaml.world.5.expect
+++ b/pkg/front_end/testcases/incremental/reissue_errors_10.yaml.world.5.expect

@@ -41,9 +41,9 @@
 Constructor coverage from constants:
 org-dartlang-test:///lib2.dart:
 - Foo. (from org-dartlang-test:///lib.dart:2:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 org-dartlang-test:///lib3.dart:
 - Foo. (from org-dartlang-test:///lib.dart:2:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/reissue_errors_11.yaml.world.3.expect b/pkg/front_end/testcases/incremental/reissue_errors_11.yaml.world.3.expect
index f913229..eab47af 100644
--- a/pkg/front_end/testcases/incremental/reissue_errors_11.yaml.world.3.expect
+++ b/pkg/front_end/testcases/incremental/reissue_errors_11.yaml.world.3.expect

@@ -40,5 +40,5 @@
 Constructor coverage from constants:
 org-dartlang-test:///lib2.dart:
 - Foo. (from org-dartlang-test:///lib.dart:2:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/incremental/reissue_errors_9.yaml.world.3.expect b/pkg/front_end/testcases/incremental/reissue_errors_9.yaml.world.3.expect
index 32b7c54..10ecedf 100644
--- a/pkg/front_end/testcases/incremental/reissue_errors_9.yaml.world.3.expect
+++ b/pkg/front_end/testcases/incremental/reissue_errors_9.yaml.world.3.expect

@@ -41,5 +41,5 @@
 Constructor coverage from constants:
 org-dartlang-test:///lib2.dart:
 - Foo. (from org-dartlang-test:///lib.dart:2:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 

diff --git a/pkg/front_end/testcases/inference/constructors_infer_from_arguments_const.dart.weak.expect b/pkg/front_end/testcases/inference/constructors_infer_from_arguments_const.dart.weak.expect
index 1d13d5d..68278a6 100644
--- a/pkg/front_end/testcases/inference/constructors_infer_from_arguments_const.dart.weak.expect
+++ b/pkg/front_end/testcases/inference/constructors_infer_from_arguments_const.dart.weak.expect

@@ -21,4 +21,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///constructors_infer_from_arguments_const.dart:
 - C. (from org-dartlang-testcase:///constructors_infer_from_arguments_const.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/inference/constructors_infer_from_arguments_const.dart.weak.modular.expect b/pkg/front_end/testcases/inference/constructors_infer_from_arguments_const.dart.weak.modular.expect
index 1d13d5d..68278a6 100644
--- a/pkg/front_end/testcases/inference/constructors_infer_from_arguments_const.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/inference/constructors_infer_from_arguments_const.dart.weak.modular.expect

@@ -21,4 +21,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///constructors_infer_from_arguments_const.dart:
 - C. (from org-dartlang-testcase:///constructors_infer_from_arguments_const.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/inference/constructors_infer_from_arguments_const.dart.weak.transformed.expect b/pkg/front_end/testcases/inference/constructors_infer_from_arguments_const.dart.weak.transformed.expect
index 1d13d5d..68278a6 100644
--- a/pkg/front_end/testcases/inference/constructors_infer_from_arguments_const.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/inference/constructors_infer_from_arguments_const.dart.weak.transformed.expect

@@ -21,4 +21,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///constructors_infer_from_arguments_const.dart:
 - C. (from org-dartlang-testcase:///constructors_infer_from_arguments_const.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/inference/constructors_infer_from_arguments_const_with_upper_bound.dart.weak.expect b/pkg/front_end/testcases/inference/constructors_infer_from_arguments_const_with_upper_bound.dart.weak.expect
index 6b607e5..4cb17eb 100644
--- a/pkg/front_end/testcases/inference/constructors_infer_from_arguments_const_with_upper_bound.dart.weak.expect
+++ b/pkg/front_end/testcases/inference/constructors_infer_from_arguments_const_with_upper_bound.dart.weak.expect

@@ -26,5 +26,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///constructors_infer_from_arguments_const_with_upper_bound.dart:
 - C. (from org-dartlang-testcase:///constructors_infer_from_arguments_const_with_upper_bound.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - D. (from org-dartlang-testcase:///constructors_infer_from_arguments_const_with_upper_bound.dart:14:9)

diff --git a/pkg/front_end/testcases/inference/constructors_infer_from_arguments_const_with_upper_bound.dart.weak.modular.expect b/pkg/front_end/testcases/inference/constructors_infer_from_arguments_const_with_upper_bound.dart.weak.modular.expect
index 6b607e5..4cb17eb 100644
--- a/pkg/front_end/testcases/inference/constructors_infer_from_arguments_const_with_upper_bound.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/inference/constructors_infer_from_arguments_const_with_upper_bound.dart.weak.modular.expect

@@ -26,5 +26,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///constructors_infer_from_arguments_const_with_upper_bound.dart:
 - C. (from org-dartlang-testcase:///constructors_infer_from_arguments_const_with_upper_bound.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - D. (from org-dartlang-testcase:///constructors_infer_from_arguments_const_with_upper_bound.dart:14:9)

diff --git a/pkg/front_end/testcases/inference/constructors_infer_from_arguments_const_with_upper_bound.dart.weak.transformed.expect b/pkg/front_end/testcases/inference/constructors_infer_from_arguments_const_with_upper_bound.dart.weak.transformed.expect
index 6b607e5..4cb17eb 100644
--- a/pkg/front_end/testcases/inference/constructors_infer_from_arguments_const_with_upper_bound.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/inference/constructors_infer_from_arguments_const_with_upper_bound.dart.weak.transformed.expect

@@ -26,5 +26,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///constructors_infer_from_arguments_const_with_upper_bound.dart:
 - C. (from org-dartlang-testcase:///constructors_infer_from_arguments_const_with_upper_bound.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - D. (from org-dartlang-testcase:///constructors_infer_from_arguments_const_with_upper_bound.dart:14:9)

diff --git a/pkg/front_end/testcases/inference/downwards_inference_annotations.dart.weak.expect b/pkg/front_end/testcases/inference/downwards_inference_annotations.dart.weak.expect
index d3633ff..754e427 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_annotations.dart.weak.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_annotations.dart.weak.expect

@@ -32,5 +32,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///downwards_inference_annotations.dart:
 - Foo. (from org-dartlang-testcase:///downwards_inference_annotations.dart:9:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Foo.named (from org-dartlang-testcase:///downwards_inference_annotations.dart:10:9)

diff --git a/pkg/front_end/testcases/inference/downwards_inference_annotations.dart.weak.modular.expect b/pkg/front_end/testcases/inference/downwards_inference_annotations.dart.weak.modular.expect
index d3633ff..754e427 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_annotations.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_annotations.dart.weak.modular.expect

@@ -32,5 +32,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///downwards_inference_annotations.dart:
 - Foo. (from org-dartlang-testcase:///downwards_inference_annotations.dart:9:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Foo.named (from org-dartlang-testcase:///downwards_inference_annotations.dart:10:9)

diff --git a/pkg/front_end/testcases/inference/downwards_inference_annotations.dart.weak.transformed.expect b/pkg/front_end/testcases/inference/downwards_inference_annotations.dart.weak.transformed.expect
index d3633ff..754e427 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_annotations.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_annotations.dart.weak.transformed.expect

@@ -32,5 +32,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///downwards_inference_annotations.dart:
 - Foo. (from org-dartlang-testcase:///downwards_inference_annotations.dart:9:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Foo.named (from org-dartlang-testcase:///downwards_inference_annotations.dart:10:9)

diff --git a/pkg/front_end/testcases/inference/downwards_inference_annotations_class_members.dart.weak.expect b/pkg/front_end/testcases/inference/downwards_inference_annotations_class_members.dart.weak.expect
index e89b037..2577bfe 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_annotations_class_members.dart.weak.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_annotations_class_members.dart.weak.expect

@@ -27,4 +27,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///downwards_inference_annotations_class_members.dart:
 - Foo. (from org-dartlang-testcase:///downwards_inference_annotations_class_members.dart:9:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/inference/downwards_inference_annotations_class_members.dart.weak.modular.expect b/pkg/front_end/testcases/inference/downwards_inference_annotations_class_members.dart.weak.modular.expect
index e89b037..2577bfe 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_annotations_class_members.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_annotations_class_members.dart.weak.modular.expect

@@ -27,4 +27,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///downwards_inference_annotations_class_members.dart:
 - Foo. (from org-dartlang-testcase:///downwards_inference_annotations_class_members.dart:9:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/inference/downwards_inference_annotations_class_members.dart.weak.transformed.expect b/pkg/front_end/testcases/inference/downwards_inference_annotations_class_members.dart.weak.transformed.expect
index e89b037..2577bfe 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_annotations_class_members.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_annotations_class_members.dart.weak.transformed.expect

@@ -27,4 +27,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///downwards_inference_annotations_class_members.dart:
 - Foo. (from org-dartlang-testcase:///downwards_inference_annotations_class_members.dart:9:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/inference/downwards_inference_annotations_for_loop_variable.dart.weak.expect b/pkg/front_end/testcases/inference/downwards_inference_annotations_for_loop_variable.dart.weak.expect
index f763483..aa1476c 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_annotations_for_loop_variable.dart.weak.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_annotations_for_loop_variable.dart.weak.expect

@@ -23,4 +23,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///downwards_inference_annotations_for_loop_variable.dart:
 - Foo. (from org-dartlang-testcase:///downwards_inference_annotations_for_loop_variable.dart:9:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/inference/downwards_inference_annotations_for_loop_variable.dart.weak.modular.expect b/pkg/front_end/testcases/inference/downwards_inference_annotations_for_loop_variable.dart.weak.modular.expect
index f763483..aa1476c 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_annotations_for_loop_variable.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_annotations_for_loop_variable.dart.weak.modular.expect

@@ -23,4 +23,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///downwards_inference_annotations_for_loop_variable.dart:
 - Foo. (from org-dartlang-testcase:///downwards_inference_annotations_for_loop_variable.dart:9:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/inference/downwards_inference_annotations_for_loop_variable.dart.weak.transformed.expect b/pkg/front_end/testcases/inference/downwards_inference_annotations_for_loop_variable.dart.weak.transformed.expect
index aae71dc..79a70a6 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_annotations_for_loop_variable.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_annotations_for_loop_variable.dart.weak.transformed.expect

@@ -28,4 +28,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///downwards_inference_annotations_for_loop_variable.dart:
 - Foo. (from org-dartlang-testcase:///downwards_inference_annotations_for_loop_variable.dart:9:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/inference/downwards_inference_annotations_locals.dart.weak.expect b/pkg/front_end/testcases/inference/downwards_inference_annotations_locals.dart.weak.expect
index 45a1c08..98c6c0f 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_annotations_locals.dart.weak.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_annotations_locals.dart.weak.expect

@@ -22,4 +22,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///downwards_inference_annotations_locals.dart:
 - Foo. (from org-dartlang-testcase:///downwards_inference_annotations_locals.dart:9:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/inference/downwards_inference_annotations_locals.dart.weak.modular.expect b/pkg/front_end/testcases/inference/downwards_inference_annotations_locals.dart.weak.modular.expect
index 45a1c08..98c6c0f 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_annotations_locals.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_annotations_locals.dart.weak.modular.expect

@@ -22,4 +22,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///downwards_inference_annotations_locals.dart:
 - Foo. (from org-dartlang-testcase:///downwards_inference_annotations_locals.dart:9:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/inference/downwards_inference_annotations_locals.dart.weak.transformed.expect b/pkg/front_end/testcases/inference/downwards_inference_annotations_locals.dart.weak.transformed.expect
index 45a1c08..98c6c0f 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_annotations_locals.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_annotations_locals.dart.weak.transformed.expect

@@ -22,4 +22,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///downwards_inference_annotations_locals.dart:
 - Foo. (from org-dartlang-testcase:///downwards_inference_annotations_locals.dart:9:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/inference/downwards_inference_annotations_locals_referring_to_locals.dart.weak.expect b/pkg/front_end/testcases/inference/downwards_inference_annotations_locals_referring_to_locals.dart.weak.expect
index 2fe85fc..86422af 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_annotations_locals_referring_to_locals.dart.weak.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_annotations_locals_referring_to_locals.dart.weak.expect

@@ -23,4 +23,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///downwards_inference_annotations_locals_referring_to_locals.dart:
 - Foo. (from org-dartlang-testcase:///downwards_inference_annotations_locals_referring_to_locals.dart:9:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/inference/downwards_inference_annotations_locals_referring_to_locals.dart.weak.modular.expect b/pkg/front_end/testcases/inference/downwards_inference_annotations_locals_referring_to_locals.dart.weak.modular.expect
index 2fe85fc..86422af 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_annotations_locals_referring_to_locals.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_annotations_locals_referring_to_locals.dart.weak.modular.expect

@@ -23,4 +23,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///downwards_inference_annotations_locals_referring_to_locals.dart:
 - Foo. (from org-dartlang-testcase:///downwards_inference_annotations_locals_referring_to_locals.dart:9:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/inference/downwards_inference_annotations_locals_referring_to_locals.dart.weak.transformed.expect b/pkg/front_end/testcases/inference/downwards_inference_annotations_locals_referring_to_locals.dart.weak.transformed.expect
index 2fe85fc..86422af 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_annotations_locals_referring_to_locals.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_annotations_locals_referring_to_locals.dart.weak.transformed.expect

@@ -23,4 +23,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///downwards_inference_annotations_locals_referring_to_locals.dart:
 - Foo. (from org-dartlang-testcase:///downwards_inference_annotations_locals_referring_to_locals.dart:9:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/inference/downwards_inference_annotations_parameter.dart.weak.expect b/pkg/front_end/testcases/inference/downwards_inference_annotations_parameter.dart.weak.expect
index 9ce8fd2..8fd7819 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_annotations_parameter.dart.weak.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_annotations_parameter.dart.weak.expect

@@ -24,4 +24,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///downwards_inference_annotations_parameter.dart:
 - Foo. (from org-dartlang-testcase:///downwards_inference_annotations_parameter.dart:9:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/inference/downwards_inference_annotations_parameter.dart.weak.modular.expect b/pkg/front_end/testcases/inference/downwards_inference_annotations_parameter.dart.weak.modular.expect
index 9ce8fd2..8fd7819 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_annotations_parameter.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_annotations_parameter.dart.weak.modular.expect

@@ -24,4 +24,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///downwards_inference_annotations_parameter.dart:
 - Foo. (from org-dartlang-testcase:///downwards_inference_annotations_parameter.dart:9:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/inference/downwards_inference_annotations_parameter.dart.weak.transformed.expect b/pkg/front_end/testcases/inference/downwards_inference_annotations_parameter.dart.weak.transformed.expect
index 9ce8fd2..8fd7819 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_annotations_parameter.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_annotations_parameter.dart.weak.transformed.expect

@@ -24,4 +24,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///downwards_inference_annotations_parameter.dart:
 - Foo. (from org-dartlang-testcase:///downwards_inference_annotations_parameter.dart:9:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/inference/downwards_inference_annotations_parameter_local.dart.weak.expect b/pkg/front_end/testcases/inference/downwards_inference_annotations_parameter_local.dart.weak.expect
index f909b9a..e6f9158 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_annotations_parameter_local.dart.weak.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_annotations_parameter_local.dart.weak.expect

@@ -21,4 +21,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///downwards_inference_annotations_parameter_local.dart:
 - Foo. (from org-dartlang-testcase:///downwards_inference_annotations_parameter_local.dart:9:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/inference/downwards_inference_annotations_parameter_local.dart.weak.modular.expect b/pkg/front_end/testcases/inference/downwards_inference_annotations_parameter_local.dart.weak.modular.expect
index f909b9a..e6f9158 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_annotations_parameter_local.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_annotations_parameter_local.dart.weak.modular.expect

@@ -21,4 +21,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///downwards_inference_annotations_parameter_local.dart:
 - Foo. (from org-dartlang-testcase:///downwards_inference_annotations_parameter_local.dart:9:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/inference/downwards_inference_annotations_parameter_local.dart.weak.transformed.expect b/pkg/front_end/testcases/inference/downwards_inference_annotations_parameter_local.dart.weak.transformed.expect
index f909b9a..e6f9158 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_annotations_parameter_local.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_annotations_parameter_local.dart.weak.transformed.expect

@@ -21,4 +21,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///downwards_inference_annotations_parameter_local.dart:
 - Foo. (from org-dartlang-testcase:///downwards_inference_annotations_parameter_local.dart:9:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/inference/downwards_inference_annotations_type_variable.dart.weak.expect b/pkg/front_end/testcases/inference/downwards_inference_annotations_type_variable.dart.weak.expect
index 32d9ea9..ec31531 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_annotations_type_variable.dart.weak.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_annotations_type_variable.dart.weak.expect

@@ -30,4 +30,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///downwards_inference_annotations_type_variable.dart:
 - Foo. (from org-dartlang-testcase:///downwards_inference_annotations_type_variable.dart:9:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/inference/downwards_inference_annotations_type_variable.dart.weak.modular.expect b/pkg/front_end/testcases/inference/downwards_inference_annotations_type_variable.dart.weak.modular.expect
index 32d9ea9..ec31531 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_annotations_type_variable.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_annotations_type_variable.dart.weak.modular.expect

@@ -30,4 +30,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///downwards_inference_annotations_type_variable.dart:
 - Foo. (from org-dartlang-testcase:///downwards_inference_annotations_type_variable.dart:9:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/inference/downwards_inference_annotations_type_variable.dart.weak.transformed.expect b/pkg/front_end/testcases/inference/downwards_inference_annotations_type_variable.dart.weak.transformed.expect
index 32d9ea9..ec31531 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_annotations_type_variable.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_annotations_type_variable.dart.weak.transformed.expect

@@ -30,4 +30,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///downwards_inference_annotations_type_variable.dart:
 - Foo. (from org-dartlang-testcase:///downwards_inference_annotations_type_variable.dart:9:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/inference/downwards_inference_annotations_type_variable_local.dart.weak.expect b/pkg/front_end/testcases/inference/downwards_inference_annotations_type_variable_local.dart.weak.expect
index b650eaa..e699a8d 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_annotations_type_variable_local.dart.weak.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_annotations_type_variable_local.dart.weak.expect

@@ -21,4 +21,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///downwards_inference_annotations_type_variable_local.dart:
 - Foo. (from org-dartlang-testcase:///downwards_inference_annotations_type_variable_local.dart:9:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/inference/downwards_inference_annotations_type_variable_local.dart.weak.modular.expect b/pkg/front_end/testcases/inference/downwards_inference_annotations_type_variable_local.dart.weak.modular.expect
index b650eaa..e699a8d 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_annotations_type_variable_local.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_annotations_type_variable_local.dart.weak.modular.expect

@@ -21,4 +21,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///downwards_inference_annotations_type_variable_local.dart:
 - Foo. (from org-dartlang-testcase:///downwards_inference_annotations_type_variable_local.dart:9:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/inference/downwards_inference_annotations_type_variable_local.dart.weak.transformed.expect b/pkg/front_end/testcases/inference/downwards_inference_annotations_type_variable_local.dart.weak.transformed.expect
index b650eaa..e699a8d 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_annotations_type_variable_local.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_annotations_type_variable_local.dart.weak.transformed.expect

@@ -21,4 +21,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///downwards_inference_annotations_type_variable_local.dart:
 - Foo. (from org-dartlang-testcase:///downwards_inference_annotations_type_variable_local.dart:9:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/inference/downwards_inference_annotations_typedef.dart.weak.expect b/pkg/front_end/testcases/inference/downwards_inference_annotations_typedef.dart.weak.expect
index b68c2bb..77772af 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_annotations_typedef.dart.weak.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_annotations_typedef.dart.weak.expect

@@ -19,4 +19,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///downwards_inference_annotations_typedef.dart:
 - Foo. (from org-dartlang-testcase:///downwards_inference_annotations_typedef.dart:9:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/inference/downwards_inference_annotations_typedef.dart.weak.modular.expect b/pkg/front_end/testcases/inference/downwards_inference_annotations_typedef.dart.weak.modular.expect
index b68c2bb..77772af 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_annotations_typedef.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_annotations_typedef.dart.weak.modular.expect

@@ -19,4 +19,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///downwards_inference_annotations_typedef.dart:
 - Foo. (from org-dartlang-testcase:///downwards_inference_annotations_typedef.dart:9:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/inference/downwards_inference_annotations_typedef.dart.weak.transformed.expect b/pkg/front_end/testcases/inference/downwards_inference_annotations_typedef.dart.weak.transformed.expect
index b68c2bb..77772af 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_annotations_typedef.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_annotations_typedef.dart.weak.transformed.expect

@@ -19,4 +19,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///downwards_inference_annotations_typedef.dart:
 - Foo. (from org-dartlang-testcase:///downwards_inference_annotations_typedef.dart:9:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/inference/inferred_type_is_enum.dart.weak.expect b/pkg/front_end/testcases/inference/inferred_type_is_enum.dart.weak.expect
index baf973d..73ebbc0 100644
--- a/pkg/front_end/testcases/inference/inferred_type_is_enum.dart.weak.expect
+++ b/pkg/front_end/testcases/inference/inferred_type_is_enum.dart.weak.expect

@@ -27,5 +27,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///inferred_type_is_enum.dart:
 - E. (from org-dartlang-testcase:///inferred_type_is_enum.dart:8:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/inference/inferred_type_is_enum.dart.weak.modular.expect b/pkg/front_end/testcases/inference/inferred_type_is_enum.dart.weak.modular.expect
index baf973d..73ebbc0 100644
--- a/pkg/front_end/testcases/inference/inferred_type_is_enum.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/inference/inferred_type_is_enum.dart.weak.modular.expect

@@ -27,5 +27,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///inferred_type_is_enum.dart:
 - E. (from org-dartlang-testcase:///inferred_type_is_enum.dart:8:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/inference/inferred_type_is_enum.dart.weak.transformed.expect b/pkg/front_end/testcases/inference/inferred_type_is_enum.dart.weak.transformed.expect
index baf973d..73ebbc0 100644
--- a/pkg/front_end/testcases/inference/inferred_type_is_enum.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/inference/inferred_type_is_enum.dart.weak.transformed.expect

@@ -27,5 +27,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///inferred_type_is_enum.dart:
 - E. (from org-dartlang-testcase:///inferred_type_is_enum.dart:8:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/inference/inferred_type_is_enum_values.dart.weak.expect b/pkg/front_end/testcases/inference/inferred_type_is_enum_values.dart.weak.expect
index a239515..1442597 100644
--- a/pkg/front_end/testcases/inference/inferred_type_is_enum_values.dart.weak.expect
+++ b/pkg/front_end/testcases/inference/inferred_type_is_enum_values.dart.weak.expect

@@ -27,5 +27,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///inferred_type_is_enum_values.dart:
 - E. (from org-dartlang-testcase:///inferred_type_is_enum_values.dart:8:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/inference/inferred_type_is_enum_values.dart.weak.modular.expect b/pkg/front_end/testcases/inference/inferred_type_is_enum_values.dart.weak.modular.expect
index a239515..1442597 100644
--- a/pkg/front_end/testcases/inference/inferred_type_is_enum_values.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/inference/inferred_type_is_enum_values.dart.weak.modular.expect

@@ -27,5 +27,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///inferred_type_is_enum_values.dart:
 - E. (from org-dartlang-testcase:///inferred_type_is_enum_values.dart:8:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/inference/inferred_type_is_enum_values.dart.weak.transformed.expect b/pkg/front_end/testcases/inference/inferred_type_is_enum_values.dart.weak.transformed.expect
index a239515..1442597 100644
--- a/pkg/front_end/testcases/inference/inferred_type_is_enum_values.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/inference/inferred_type_is_enum_values.dart.weak.transformed.expect

@@ -27,5 +27,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///inferred_type_is_enum_values.dart:
 - E. (from org-dartlang-testcase:///inferred_type_is_enum_values.dart:8:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/inference_new/const_invocation.dart.weak.expect b/pkg/front_end/testcases/inference_new/const_invocation.dart.weak.expect
index f4a759d..c6711e3 100644
--- a/pkg/front_end/testcases/inference_new/const_invocation.dart.weak.expect
+++ b/pkg/front_end/testcases/inference_new/const_invocation.dart.weak.expect

@@ -49,4 +49,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_invocation.dart:
 - Bar. (from org-dartlang-testcase:///const_invocation.dart:24:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/inference_new/const_invocation.dart.weak.modular.expect b/pkg/front_end/testcases/inference_new/const_invocation.dart.weak.modular.expect
index f4a759d..c6711e3 100644
--- a/pkg/front_end/testcases/inference_new/const_invocation.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/inference_new/const_invocation.dart.weak.modular.expect

@@ -49,4 +49,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_invocation.dart:
 - Bar. (from org-dartlang-testcase:///const_invocation.dart:24:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/inference_new/const_invocation.dart.weak.transformed.expect b/pkg/front_end/testcases/inference_new/const_invocation.dart.weak.transformed.expect
index f4a759d..c6711e3 100644
--- a/pkg/front_end/testcases/inference_new/const_invocation.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/inference_new/const_invocation.dart.weak.transformed.expect

@@ -49,4 +49,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_invocation.dart:
 - Bar. (from org-dartlang-testcase:///const_invocation.dart:24:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/inference_new/switch.dart.weak.expect b/pkg/front_end/testcases/inference_new/switch.dart.weak.expect
index 7c4f04f..5619c31 100644
--- a/pkg/front_end/testcases/inference_new/switch.dart.weak.expect
+++ b/pkg/front_end/testcases/inference_new/switch.dart.weak.expect

@@ -36,4 +36,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///switch.dart:
 - C. (from org-dartlang-testcase:///switch.dart:11:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/inference_new/switch.dart.weak.modular.expect b/pkg/front_end/testcases/inference_new/switch.dart.weak.modular.expect
index 7c4f04f..5619c31 100644
--- a/pkg/front_end/testcases/inference_new/switch.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/inference_new/switch.dart.weak.modular.expect

@@ -36,4 +36,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///switch.dart:
 - C. (from org-dartlang-testcase:///switch.dart:11:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/inference_new/switch.dart.weak.transformed.expect b/pkg/front_end/testcases/inference_new/switch.dart.weak.transformed.expect
index 7c4f04f..5619c31 100644
--- a/pkg/front_end/testcases/inference_new/switch.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/inference_new/switch.dart.weak.transformed.expect

@@ -36,4 +36,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///switch.dart:
 - C. (from org-dartlang-testcase:///switch.dart:11:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/late_lowering/late_annotations.dart.strong.expect b/pkg/front_end/testcases/late_lowering/late_annotations.dart.strong.expect
index 5966501..31bd3e7 100644
--- a/pkg/front_end/testcases/late_lowering/late_annotations.dart.strong.expect
+++ b/pkg/front_end/testcases/late_lowering/late_annotations.dart.strong.expect

@@ -175,4 +175,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///late_annotations.dart:
 - Annotation. (from org-dartlang-testcase:///late_annotations.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/late_lowering/late_annotations.dart.strong.transformed.expect b/pkg/front_end/testcases/late_lowering/late_annotations.dart.strong.transformed.expect
index 68c30b5..d25c6e8 100644
--- a/pkg/front_end/testcases/late_lowering/late_annotations.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/late_lowering/late_annotations.dart.strong.transformed.expect

@@ -184,4 +184,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///late_annotations.dart:
 - Annotation. (from org-dartlang-testcase:///late_annotations.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/late_lowering/late_annotations.dart.weak.expect b/pkg/front_end/testcases/late_lowering/late_annotations.dart.weak.expect
index 061a612..c6d998f 100644
--- a/pkg/front_end/testcases/late_lowering/late_annotations.dart.weak.expect
+++ b/pkg/front_end/testcases/late_lowering/late_annotations.dart.weak.expect

@@ -274,4 +274,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///late_annotations.dart:
 - Annotation. (from org-dartlang-testcase:///late_annotations.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/late_lowering/late_annotations.dart.weak.modular.expect b/pkg/front_end/testcases/late_lowering/late_annotations.dart.weak.modular.expect
index 061a612..c6d998f 100644
--- a/pkg/front_end/testcases/late_lowering/late_annotations.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/late_lowering/late_annotations.dart.weak.modular.expect

@@ -274,4 +274,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///late_annotations.dart:
 - Annotation. (from org-dartlang-testcase:///late_annotations.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/late_lowering/late_annotations.dart.weak.transformed.expect b/pkg/front_end/testcases/late_lowering/late_annotations.dart.weak.transformed.expect
index 061a612..c6d998f 100644
--- a/pkg/front_end/testcases/late_lowering/late_annotations.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/late_lowering/late_annotations.dart.weak.transformed.expect

@@ -274,4 +274,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///late_annotations.dart:
 - Annotation. (from org-dartlang-testcase:///late_annotations.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/macros/multiple_imports.dart.strong.expect b/pkg/front_end/testcases/macros/multiple_imports.dart.strong.expect
index bb8a142..9644628 100644
--- a/pkg/front_end/testcases/macros/multiple_imports.dart.strong.expect
+++ b/pkg/front_end/testcases/macros/multiple_imports.dart.strong.expect

@@ -44,4 +44,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///multiple_imports.dart:
 - Const. (from org-dartlang-testcase:///multiple_imports_lib.dart:18:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/macros/multiple_imports.dart.strong.transformed.expect b/pkg/front_end/testcases/macros/multiple_imports.dart.strong.transformed.expect
index bb8a142..9644628 100644
--- a/pkg/front_end/testcases/macros/multiple_imports.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/macros/multiple_imports.dart.strong.transformed.expect

@@ -44,4 +44,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///multiple_imports.dart:
 - Const. (from org-dartlang-testcase:///multiple_imports_lib.dart:18:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/macros/multiple_imports.dart.weak.expect b/pkg/front_end/testcases/macros/multiple_imports.dart.weak.expect
index bb8a142..9644628 100644
--- a/pkg/front_end/testcases/macros/multiple_imports.dart.weak.expect
+++ b/pkg/front_end/testcases/macros/multiple_imports.dart.weak.expect

@@ -44,4 +44,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///multiple_imports.dart:
 - Const. (from org-dartlang-testcase:///multiple_imports_lib.dart:18:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/macros/multiple_imports.dart.weak.modular.expect b/pkg/front_end/testcases/macros/multiple_imports.dart.weak.modular.expect
index bb8a142..9644628 100644
--- a/pkg/front_end/testcases/macros/multiple_imports.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/macros/multiple_imports.dart.weak.modular.expect

@@ -44,4 +44,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///multiple_imports.dart:
 - Const. (from org-dartlang-testcase:///multiple_imports_lib.dart:18:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/macros/multiple_imports.dart.weak.transformed.expect b/pkg/front_end/testcases/macros/multiple_imports.dart.weak.transformed.expect
index bb8a142..9644628 100644
--- a/pkg/front_end/testcases/macros/multiple_imports.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/macros/multiple_imports.dart.weak.transformed.expect

@@ -44,4 +44,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///multiple_imports.dart:
 - Const. (from org-dartlang-testcase:///multiple_imports_lib.dart:18:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/assignability_error_messages.dart.strong.expect b/pkg/front_end/testcases/nnbd/assignability_error_messages.dart.strong.expect
index e2e0194..4297a47 100644
--- a/pkg/front_end/testcases/nnbd/assignability_error_messages.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/assignability_error_messages.dart.strong.expect

@@ -390,4 +390,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///assignability_error_messages.dart:
 - A. (from org-dartlang-testcase:///assignability_error_messages.dart:11:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/assignability_error_messages.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/assignability_error_messages.dart.strong.transformed.expect
index 564f0b5..7b057a7 100644
--- a/pkg/front_end/testcases/nnbd/assignability_error_messages.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/assignability_error_messages.dart.strong.transformed.expect

@@ -407,4 +407,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///assignability_error_messages.dart:
 - A. (from org-dartlang-testcase:///assignability_error_messages.dart:11:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/assignability_error_messages.dart.weak.expect b/pkg/front_end/testcases/nnbd/assignability_error_messages.dart.weak.expect
index e2e0194..4297a47 100644
--- a/pkg/front_end/testcases/nnbd/assignability_error_messages.dart.weak.expect
+++ b/pkg/front_end/testcases/nnbd/assignability_error_messages.dart.weak.expect

@@ -390,4 +390,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///assignability_error_messages.dart:
 - A. (from org-dartlang-testcase:///assignability_error_messages.dart:11:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/assignability_error_messages.dart.weak.modular.expect b/pkg/front_end/testcases/nnbd/assignability_error_messages.dart.weak.modular.expect
index e2e0194..4297a47 100644
--- a/pkg/front_end/testcases/nnbd/assignability_error_messages.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/nnbd/assignability_error_messages.dart.weak.modular.expect

@@ -390,4 +390,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///assignability_error_messages.dart:
 - A. (from org-dartlang-testcase:///assignability_error_messages.dart:11:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/assignability_error_messages.dart.weak.transformed.expect b/pkg/front_end/testcases/nnbd/assignability_error_messages.dart.weak.transformed.expect
index 65746d3..db03b27 100644
--- a/pkg/front_end/testcases/nnbd/assignability_error_messages.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/assignability_error_messages.dart.weak.transformed.expect

@@ -407,4 +407,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///assignability_error_messages.dart:
 - A. (from org-dartlang-testcase:///assignability_error_messages.dart:11:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/const_canonical_type.dart.strong.expect b/pkg/front_end/testcases/nnbd/const_canonical_type.dart.strong.expect
index 478af10..16a6b77 100644
--- a/pkg/front_end/testcases/nnbd/const_canonical_type.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/const_canonical_type.dart.strong.expect

@@ -60,5 +60,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_canonical_type.dart:
 - A. (from org-dartlang-testcase:///const_canonical_type.dart:22:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Check. (from org-dartlang-testcase:///const_canonical_type.dart:10:9)

diff --git a/pkg/front_end/testcases/nnbd/const_canonical_type.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/const_canonical_type.dart.strong.transformed.expect
index 478af10..16a6b77 100644
--- a/pkg/front_end/testcases/nnbd/const_canonical_type.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/const_canonical_type.dart.strong.transformed.expect

@@ -60,5 +60,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_canonical_type.dart:
 - A. (from org-dartlang-testcase:///const_canonical_type.dart:22:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Check. (from org-dartlang-testcase:///const_canonical_type.dart:10:9)

diff --git a/pkg/front_end/testcases/nnbd/const_canonical_type.dart.weak.expect b/pkg/front_end/testcases/nnbd/const_canonical_type.dart.weak.expect
index 5e1af23..7c3aa96 100644
--- a/pkg/front_end/testcases/nnbd/const_canonical_type.dart.weak.expect
+++ b/pkg/front_end/testcases/nnbd/const_canonical_type.dart.weak.expect

@@ -60,5 +60,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_canonical_type.dart:
 - A. (from org-dartlang-testcase:///const_canonical_type.dart:22:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Check. (from org-dartlang-testcase:///const_canonical_type.dart:10:9)

diff --git a/pkg/front_end/testcases/nnbd/const_canonical_type.dart.weak.modular.expect b/pkg/front_end/testcases/nnbd/const_canonical_type.dart.weak.modular.expect
index 5e1af23..7c3aa96 100644
--- a/pkg/front_end/testcases/nnbd/const_canonical_type.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/nnbd/const_canonical_type.dart.weak.modular.expect

@@ -60,5 +60,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_canonical_type.dart:
 - A. (from org-dartlang-testcase:///const_canonical_type.dart:22:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Check. (from org-dartlang-testcase:///const_canonical_type.dart:10:9)

diff --git a/pkg/front_end/testcases/nnbd/const_canonical_type.dart.weak.transformed.expect b/pkg/front_end/testcases/nnbd/const_canonical_type.dart.weak.transformed.expect
index 5e1af23..7c3aa96 100644
--- a/pkg/front_end/testcases/nnbd/const_canonical_type.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/const_canonical_type.dart.weak.transformed.expect

@@ -60,5 +60,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_canonical_type.dart:
 - A. (from org-dartlang-testcase:///const_canonical_type.dart:22:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Check. (from org-dartlang-testcase:///const_canonical_type.dart:10:9)

diff --git a/pkg/front_end/testcases/nnbd/constant_null_check.dart.strong.expect b/pkg/front_end/testcases/nnbd/constant_null_check.dart.strong.expect
index a50f6c7..3f8a7fc 100644
--- a/pkg/front_end/testcases/nnbd/constant_null_check.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/constant_null_check.dart.strong.expect

@@ -57,4 +57,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///constant_null_check.dart:
 - Class. (from org-dartlang-testcase:///constant_null_check.dart:13:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/constant_null_check.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/constant_null_check.dart.strong.transformed.expect
index a50f6c7..3f8a7fc 100644
--- a/pkg/front_end/testcases/nnbd/constant_null_check.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/constant_null_check.dart.strong.transformed.expect

@@ -57,4 +57,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///constant_null_check.dart:
 - Class. (from org-dartlang-testcase:///constant_null_check.dart:13:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/constant_null_check.dart.weak.expect b/pkg/front_end/testcases/nnbd/constant_null_check.dart.weak.expect
index a50f6c7..3f8a7fc 100644
--- a/pkg/front_end/testcases/nnbd/constant_null_check.dart.weak.expect
+++ b/pkg/front_end/testcases/nnbd/constant_null_check.dart.weak.expect

@@ -57,4 +57,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///constant_null_check.dart:
 - Class. (from org-dartlang-testcase:///constant_null_check.dart:13:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/constant_null_check.dart.weak.modular.expect b/pkg/front_end/testcases/nnbd/constant_null_check.dart.weak.modular.expect
index a50f6c7..3f8a7fc 100644
--- a/pkg/front_end/testcases/nnbd/constant_null_check.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/nnbd/constant_null_check.dart.weak.modular.expect

@@ -57,4 +57,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///constant_null_check.dart:
 - Class. (from org-dartlang-testcase:///constant_null_check.dart:13:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/constant_null_check.dart.weak.transformed.expect b/pkg/front_end/testcases/nnbd/constant_null_check.dart.weak.transformed.expect
index a50f6c7..3f8a7fc 100644
--- a/pkg/front_end/testcases/nnbd/constant_null_check.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/constant_null_check.dart.weak.transformed.expect

@@ -57,4 +57,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///constant_null_check.dart:
 - Class. (from org-dartlang-testcase:///constant_null_check.dart:13:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/constant_null_is.dart.strong.expect b/pkg/front_end/testcases/nnbd/constant_null_is.dart.strong.expect
index b2e1d39..2a6e12a 100644
--- a/pkg/front_end/testcases/nnbd/constant_null_is.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/constant_null_is.dart.strong.expect

@@ -97,7 +97,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///constant_null_is.dart:
 - Class.constructor1 (from org-dartlang-testcase:///constant_null_is.dart:38:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Class.constructor2 (from org-dartlang-testcase:///constant_null_is.dart:39:9)
 - Class.constructor3 (from org-dartlang-testcase:///constant_null_is.dart:40:9)
 - Class.constructor4 (from org-dartlang-testcase:///constant_null_is.dart:41:9)

diff --git a/pkg/front_end/testcases/nnbd/constant_null_is.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/constant_null_is.dart.strong.transformed.expect
index c43182d..4d08f16 100644
--- a/pkg/front_end/testcases/nnbd/constant_null_is.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/constant_null_is.dart.strong.transformed.expect

@@ -114,7 +114,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///constant_null_is.dart:
 - Class.constructor1 (from org-dartlang-testcase:///constant_null_is.dart:38:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Class.constructor2 (from org-dartlang-testcase:///constant_null_is.dart:39:9)
 - Class.constructor3 (from org-dartlang-testcase:///constant_null_is.dart:40:9)
 - Class.constructor4 (from org-dartlang-testcase:///constant_null_is.dart:41:9)

diff --git a/pkg/front_end/testcases/nnbd/constant_null_is.dart.weak.expect b/pkg/front_end/testcases/nnbd/constant_null_is.dart.weak.expect
index 94f3fa4..c72ab50 100644
--- a/pkg/front_end/testcases/nnbd/constant_null_is.dart.weak.expect
+++ b/pkg/front_end/testcases/nnbd/constant_null_is.dart.weak.expect

@@ -97,7 +97,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///constant_null_is.dart:
 - Class.constructor1 (from org-dartlang-testcase:///constant_null_is.dart:38:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Class.constructor2 (from org-dartlang-testcase:///constant_null_is.dart:39:9)
 - Class.constructor3 (from org-dartlang-testcase:///constant_null_is.dart:40:9)
 - Class.constructor4 (from org-dartlang-testcase:///constant_null_is.dart:41:9)

diff --git a/pkg/front_end/testcases/nnbd/constant_null_is.dart.weak.modular.expect b/pkg/front_end/testcases/nnbd/constant_null_is.dart.weak.modular.expect
index 94f3fa4..c72ab50 100644
--- a/pkg/front_end/testcases/nnbd/constant_null_is.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/nnbd/constant_null_is.dart.weak.modular.expect

@@ -97,7 +97,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///constant_null_is.dart:
 - Class.constructor1 (from org-dartlang-testcase:///constant_null_is.dart:38:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Class.constructor2 (from org-dartlang-testcase:///constant_null_is.dart:39:9)
 - Class.constructor3 (from org-dartlang-testcase:///constant_null_is.dart:40:9)
 - Class.constructor4 (from org-dartlang-testcase:///constant_null_is.dart:41:9)

diff --git a/pkg/front_end/testcases/nnbd/constant_null_is.dart.weak.transformed.expect b/pkg/front_end/testcases/nnbd/constant_null_is.dart.weak.transformed.expect
index 556eb4b..7f34dde 100644
--- a/pkg/front_end/testcases/nnbd/constant_null_is.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/constant_null_is.dart.weak.transformed.expect

@@ -114,7 +114,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///constant_null_is.dart:
 - Class.constructor1 (from org-dartlang-testcase:///constant_null_is.dart:38:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Class.constructor2 (from org-dartlang-testcase:///constant_null_is.dart:39:9)
 - Class.constructor3 (from org-dartlang-testcase:///constant_null_is.dart:40:9)
 - Class.constructor4 (from org-dartlang-testcase:///constant_null_is.dart:41:9)

diff --git a/pkg/front_end/testcases/nnbd/constants.dart.strong.expect b/pkg/front_end/testcases/nnbd/constants.dart.strong.expect
index 22f41cf..f0cda76 100644
--- a/pkg/front_end/testcases/nnbd/constants.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/constants.dart.strong.expect

@@ -107,8 +107,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///constants.dart:
 - Class. (from org-dartlang-testcase:///constants_lib.dart:8:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 org-dartlang-testcase:///constants_lib.dart:
 - Class. (from org-dartlang-testcase:///constants_lib.dart:8:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/constants.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/constants.dart.strong.transformed.expect
index 22f41cf..f0cda76 100644
--- a/pkg/front_end/testcases/nnbd/constants.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/constants.dart.strong.transformed.expect

@@ -107,8 +107,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///constants.dart:
 - Class. (from org-dartlang-testcase:///constants_lib.dart:8:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 org-dartlang-testcase:///constants_lib.dart:
 - Class. (from org-dartlang-testcase:///constants_lib.dart:8:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/constants.dart.weak.expect b/pkg/front_end/testcases/nnbd/constants.dart.weak.expect
index 9af4cec..727b3ff 100644
--- a/pkg/front_end/testcases/nnbd/constants.dart.weak.expect
+++ b/pkg/front_end/testcases/nnbd/constants.dart.weak.expect

@@ -107,8 +107,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///constants.dart:
 - Class. (from org-dartlang-testcase:///constants_lib.dart:8:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 org-dartlang-testcase:///constants_lib.dart:
 - Class. (from org-dartlang-testcase:///constants_lib.dart:8:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/constants.dart.weak.modular.expect b/pkg/front_end/testcases/nnbd/constants.dart.weak.modular.expect
index 9af4cec..727b3ff 100644
--- a/pkg/front_end/testcases/nnbd/constants.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/nnbd/constants.dart.weak.modular.expect

@@ -107,8 +107,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///constants.dart:
 - Class. (from org-dartlang-testcase:///constants_lib.dart:8:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 org-dartlang-testcase:///constants_lib.dart:
 - Class. (from org-dartlang-testcase:///constants_lib.dart:8:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/constants.dart.weak.transformed.expect b/pkg/front_end/testcases/nnbd/constants.dart.weak.transformed.expect
index 9af4cec..727b3ff 100644
--- a/pkg/front_end/testcases/nnbd/constants.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/constants.dart.weak.transformed.expect

@@ -107,8 +107,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///constants.dart:
 - Class. (from org-dartlang-testcase:///constants_lib.dart:8:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 org-dartlang-testcase:///constants_lib.dart:
 - Class. (from org-dartlang-testcase:///constants_lib.dart:8:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/external_fields.dart.strong.expect b/pkg/front_end/testcases/nnbd/external_fields.dart.strong.expect
index 9ca288c..06e8395 100644
--- a/pkg/front_end/testcases/nnbd/external_fields.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/external_fields.dart.strong.expect

@@ -128,4 +128,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///external_fields.dart:
 - Annotation. (from org-dartlang-testcase:///external_fields.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/external_fields.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/external_fields.dart.strong.transformed.expect
index 9ca288c..06e8395 100644
--- a/pkg/front_end/testcases/nnbd/external_fields.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/external_fields.dart.strong.transformed.expect

@@ -128,4 +128,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///external_fields.dart:
 - Annotation. (from org-dartlang-testcase:///external_fields.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/external_fields.dart.weak.expect b/pkg/front_end/testcases/nnbd/external_fields.dart.weak.expect
index 9ca288c..06e8395 100644
--- a/pkg/front_end/testcases/nnbd/external_fields.dart.weak.expect
+++ b/pkg/front_end/testcases/nnbd/external_fields.dart.weak.expect

@@ -128,4 +128,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///external_fields.dart:
 - Annotation. (from org-dartlang-testcase:///external_fields.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/external_fields.dart.weak.modular.expect b/pkg/front_end/testcases/nnbd/external_fields.dart.weak.modular.expect
index 9ca288c..06e8395 100644
--- a/pkg/front_end/testcases/nnbd/external_fields.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/nnbd/external_fields.dart.weak.modular.expect

@@ -128,4 +128,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///external_fields.dart:
 - Annotation. (from org-dartlang-testcase:///external_fields.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/external_fields.dart.weak.transformed.expect b/pkg/front_end/testcases/nnbd/external_fields.dart.weak.transformed.expect
index 9ca288c..06e8395 100644
--- a/pkg/front_end/testcases/nnbd/external_fields.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/external_fields.dart.weak.transformed.expect

@@ -128,4 +128,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///external_fields.dart:
 - Annotation. (from org-dartlang-testcase:///external_fields.dart:6:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/ffi_sample.dart.strong.expect b/pkg/front_end/testcases/nnbd/ffi_sample.dart.strong.expect
index b376ba2..4e873a4 100644
--- a/pkg/front_end/testcases/nnbd/ffi_sample.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/ffi_sample.dart.strong.expect

@@ -34,7 +34,7 @@
 
 Constructor coverage from constants:
 org-dartlang-testcase:///ffi_sample.dart:
-- Double. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:115:9)
-- _NativeDouble. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:35:9)
-- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Double. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- _NativeDouble. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/ffi_sample.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/ffi_sample.dart.strong.transformed.expect
index 2b681fa..8e5c6fd 100644
--- a/pkg/front_end/testcases/nnbd/ffi_sample.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/ffi_sample.dart.strong.transformed.expect

@@ -65,7 +65,7 @@
 
 Constructor coverage from constants:
 org-dartlang-testcase:///ffi_sample.dart:
-- Double. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:115:9)
-- _NativeDouble. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:35:9)
-- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Double. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- _NativeDouble. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/ffi_sample.dart.weak.expect b/pkg/front_end/testcases/nnbd/ffi_sample.dart.weak.expect
index b376ba2..4e873a4 100644
--- a/pkg/front_end/testcases/nnbd/ffi_sample.dart.weak.expect
+++ b/pkg/front_end/testcases/nnbd/ffi_sample.dart.weak.expect

@@ -34,7 +34,7 @@
 
 Constructor coverage from constants:
 org-dartlang-testcase:///ffi_sample.dart:
-- Double. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:115:9)
-- _NativeDouble. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:35:9)
-- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Double. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- _NativeDouble. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/ffi_sample.dart.weak.modular.expect b/pkg/front_end/testcases/nnbd/ffi_sample.dart.weak.modular.expect
index b376ba2..4e873a4 100644
--- a/pkg/front_end/testcases/nnbd/ffi_sample.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/nnbd/ffi_sample.dart.weak.modular.expect

@@ -34,7 +34,7 @@
 
 Constructor coverage from constants:
 org-dartlang-testcase:///ffi_sample.dart:
-- Double. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:115:9)
-- _NativeDouble. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:35:9)
-- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Double. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- _NativeDouble. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/ffi_sample.dart.weak.transformed.expect b/pkg/front_end/testcases/nnbd/ffi_sample.dart.weak.transformed.expect
index 2b681fa..8e5c6fd 100644
--- a/pkg/front_end/testcases/nnbd/ffi_sample.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/ffi_sample.dart.weak.transformed.expect

@@ -65,7 +65,7 @@
 
 Constructor coverage from constants:
 org-dartlang-testcase:///ffi_sample.dart:
-- Double. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:115:9)
-- _NativeDouble. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:35:9)
-- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Double. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- _NativeDouble. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- NativeType. (from org-dartlang-sdk:///sdk/lib/ffi/native_type.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/ffi_struct_inline_array.dart.strong.expect b/pkg/front_end/testcases/nnbd/ffi_struct_inline_array.dart.strong.expect
index 143b766..d7c9920 100644
--- a/pkg/front_end/testcases/nnbd/ffi_struct_inline_array.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/ffi_struct_inline_array.dart.strong.expect

@@ -25,5 +25,5 @@
 
 Constructor coverage from constants:
 org-dartlang-testcase:///ffi_struct_inline_array.dart:
-- _ArraySize. (from org-dartlang-sdk:///sdk/lib/ffi/ffi.dart:141:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _ArraySize. (from org-dartlang-sdk:///sdk/lib/ffi/ffi.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/ffi_struct_inline_array.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/ffi_struct_inline_array.dart.strong.transformed.expect
index 0ce631d..5accafb 100644
--- a/pkg/front_end/testcases/nnbd/ffi_struct_inline_array.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/ffi_struct_inline_array.dart.strong.transformed.expect

@@ -52,5 +52,5 @@
 
 Constructor coverage from constants:
 org-dartlang-testcase:///ffi_struct_inline_array.dart:
-- _ArraySize. (from org-dartlang-sdk:///sdk/lib/ffi/ffi.dart:141:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _ArraySize. (from org-dartlang-sdk:///sdk/lib/ffi/ffi.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/ffi_struct_inline_array.dart.weak.expect b/pkg/front_end/testcases/nnbd/ffi_struct_inline_array.dart.weak.expect
index 69afb57..89b12ef 100644
--- a/pkg/front_end/testcases/nnbd/ffi_struct_inline_array.dart.weak.expect
+++ b/pkg/front_end/testcases/nnbd/ffi_struct_inline_array.dart.weak.expect

@@ -25,5 +25,5 @@
 
 Constructor coverage from constants:
 org-dartlang-testcase:///ffi_struct_inline_array.dart:
-- _ArraySize. (from org-dartlang-sdk:///sdk/lib/ffi/ffi.dart:141:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _ArraySize. (from org-dartlang-sdk:///sdk/lib/ffi/ffi.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/ffi_struct_inline_array.dart.weak.modular.expect b/pkg/front_end/testcases/nnbd/ffi_struct_inline_array.dart.weak.modular.expect
index 69afb57..89b12ef 100644
--- a/pkg/front_end/testcases/nnbd/ffi_struct_inline_array.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/nnbd/ffi_struct_inline_array.dart.weak.modular.expect

@@ -25,5 +25,5 @@
 
 Constructor coverage from constants:
 org-dartlang-testcase:///ffi_struct_inline_array.dart:
-- _ArraySize. (from org-dartlang-sdk:///sdk/lib/ffi/ffi.dart:141:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _ArraySize. (from org-dartlang-sdk:///sdk/lib/ffi/ffi.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/ffi_struct_inline_array.dart.weak.transformed.expect b/pkg/front_end/testcases/nnbd/ffi_struct_inline_array.dart.weak.transformed.expect
index 6f63e04..6e41139 100644
--- a/pkg/front_end/testcases/nnbd/ffi_struct_inline_array.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/ffi_struct_inline_array.dart.weak.transformed.expect

@@ -52,5 +52,5 @@
 
 Constructor coverage from constants:
 org-dartlang-testcase:///ffi_struct_inline_array.dart:
-- _ArraySize. (from org-dartlang-sdk:///sdk/lib/ffi/ffi.dart:141:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _ArraySize. (from org-dartlang-sdk:///sdk/lib/ffi/ffi.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/ffi_struct_inline_array_multi_dimensional.dart.strong.expect b/pkg/front_end/testcases/nnbd/ffi_struct_inline_array_multi_dimensional.dart.strong.expect
index 67f064e2..fdfed0f 100644
--- a/pkg/front_end/testcases/nnbd/ffi_struct_inline_array_multi_dimensional.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/ffi_struct_inline_array_multi_dimensional.dart.strong.expect

@@ -33,5 +33,5 @@
 
 Constructor coverage from constants:
 org-dartlang-testcase:///ffi_struct_inline_array_multi_dimensional.dart:
-- _ArraySize. (from org-dartlang-sdk:///sdk/lib/ffi/ffi.dart:141:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _ArraySize. (from org-dartlang-sdk:///sdk/lib/ffi/ffi.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/ffi_struct_inline_array_multi_dimensional.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/ffi_struct_inline_array_multi_dimensional.dart.strong.transformed.expect
index c8f0636..c63575b 100644
--- a/pkg/front_end/testcases/nnbd/ffi_struct_inline_array_multi_dimensional.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/ffi_struct_inline_array_multi_dimensional.dart.strong.transformed.expect

@@ -84,5 +84,5 @@
 
 Constructor coverage from constants:
 org-dartlang-testcase:///ffi_struct_inline_array_multi_dimensional.dart:
-- _ArraySize. (from org-dartlang-sdk:///sdk/lib/ffi/ffi.dart:141:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _ArraySize. (from org-dartlang-sdk:///sdk/lib/ffi/ffi.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/ffi_struct_inline_array_multi_dimensional.dart.weak.expect b/pkg/front_end/testcases/nnbd/ffi_struct_inline_array_multi_dimensional.dart.weak.expect
index 2a5a6bf..399c88ce1 100644
--- a/pkg/front_end/testcases/nnbd/ffi_struct_inline_array_multi_dimensional.dart.weak.expect
+++ b/pkg/front_end/testcases/nnbd/ffi_struct_inline_array_multi_dimensional.dart.weak.expect

@@ -33,5 +33,5 @@
 
 Constructor coverage from constants:
 org-dartlang-testcase:///ffi_struct_inline_array_multi_dimensional.dart:
-- _ArraySize. (from org-dartlang-sdk:///sdk/lib/ffi/ffi.dart:141:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _ArraySize. (from org-dartlang-sdk:///sdk/lib/ffi/ffi.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/ffi_struct_inline_array_multi_dimensional.dart.weak.modular.expect b/pkg/front_end/testcases/nnbd/ffi_struct_inline_array_multi_dimensional.dart.weak.modular.expect
index 2a5a6bf..399c88ce1 100644
--- a/pkg/front_end/testcases/nnbd/ffi_struct_inline_array_multi_dimensional.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/nnbd/ffi_struct_inline_array_multi_dimensional.dart.weak.modular.expect

@@ -33,5 +33,5 @@
 
 Constructor coverage from constants:
 org-dartlang-testcase:///ffi_struct_inline_array_multi_dimensional.dart:
-- _ArraySize. (from org-dartlang-sdk:///sdk/lib/ffi/ffi.dart:141:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _ArraySize. (from org-dartlang-sdk:///sdk/lib/ffi/ffi.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/ffi_struct_inline_array_multi_dimensional.dart.weak.transformed.expect b/pkg/front_end/testcases/nnbd/ffi_struct_inline_array_multi_dimensional.dart.weak.transformed.expect
index 82be0e6..787e189 100644
--- a/pkg/front_end/testcases/nnbd/ffi_struct_inline_array_multi_dimensional.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/ffi_struct_inline_array_multi_dimensional.dart.weak.transformed.expect

@@ -84,5 +84,5 @@
 
 Constructor coverage from constants:
 org-dartlang-testcase:///ffi_struct_inline_array_multi_dimensional.dart:
-- _ArraySize. (from org-dartlang-sdk:///sdk/lib/ffi/ffi.dart:141:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _ArraySize. (from org-dartlang-sdk:///sdk/lib/ffi/ffi.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/nullable_access.dart.strong.expect b/pkg/front_end/testcases/nnbd/nullable_access.dart.strong.expect
index c5958c2..3661d31 100644
--- a/pkg/front_end/testcases/nnbd/nullable_access.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/nullable_access.dart.strong.expect

@@ -63,4 +63,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///nullable_access.dart:
 - A. (from org-dartlang-testcase:///nullable_access.dart:16:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/nullable_access.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/nullable_access.dart.strong.transformed.expect
index c5958c2..3661d31 100644
--- a/pkg/front_end/testcases/nnbd/nullable_access.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/nullable_access.dart.strong.transformed.expect

@@ -63,4 +63,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///nullable_access.dart:
 - A. (from org-dartlang-testcase:///nullable_access.dart:16:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/nullable_access.dart.weak.expect b/pkg/front_end/testcases/nnbd/nullable_access.dart.weak.expect
index c5958c2..3661d31 100644
--- a/pkg/front_end/testcases/nnbd/nullable_access.dart.weak.expect
+++ b/pkg/front_end/testcases/nnbd/nullable_access.dart.weak.expect

@@ -63,4 +63,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///nullable_access.dart:
 - A. (from org-dartlang-testcase:///nullable_access.dart:16:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/nullable_access.dart.weak.modular.expect b/pkg/front_end/testcases/nnbd/nullable_access.dart.weak.modular.expect
index c5958c2..3661d31 100644
--- a/pkg/front_end/testcases/nnbd/nullable_access.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/nnbd/nullable_access.dart.weak.modular.expect

@@ -63,4 +63,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///nullable_access.dart:
 - A. (from org-dartlang-testcase:///nullable_access.dart:16:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/nullable_access.dart.weak.transformed.expect b/pkg/front_end/testcases/nnbd/nullable_access.dart.weak.transformed.expect
index c5958c2..3661d31 100644
--- a/pkg/front_end/testcases/nnbd/nullable_access.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/nullable_access.dart.weak.transformed.expect

@@ -63,4 +63,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///nullable_access.dart:
 - A. (from org-dartlang-testcase:///nullable_access.dart:16:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/potentially_constant_type_as.dart.strong.expect b/pkg/front_end/testcases/nnbd/potentially_constant_type_as.dart.strong.expect
index 7948117..5db5fbf 100644
--- a/pkg/front_end/testcases/nnbd/potentially_constant_type_as.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/potentially_constant_type_as.dart.strong.expect

@@ -259,7 +259,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///potentially_constant_type_as.dart:
 - Class. (from org-dartlang-testcase:///potentially_constant_type_as.dart:16:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - ClassWithBound. (from org-dartlang-testcase:///potentially_constant_type_as.dart:22:9)
 - ClassWithBound.withValue (from org-dartlang-testcase:///potentially_constant_type_as.dart:24:9)
 - ClassWithList. (from org-dartlang-testcase:///potentially_constant_type_as.dart:30:9)

diff --git a/pkg/front_end/testcases/nnbd/potentially_constant_type_as.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/potentially_constant_type_as.dart.strong.transformed.expect
index 7948117..5db5fbf 100644
--- a/pkg/front_end/testcases/nnbd/potentially_constant_type_as.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/potentially_constant_type_as.dart.strong.transformed.expect

@@ -259,7 +259,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///potentially_constant_type_as.dart:
 - Class. (from org-dartlang-testcase:///potentially_constant_type_as.dart:16:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - ClassWithBound. (from org-dartlang-testcase:///potentially_constant_type_as.dart:22:9)
 - ClassWithBound.withValue (from org-dartlang-testcase:///potentially_constant_type_as.dart:24:9)
 - ClassWithList. (from org-dartlang-testcase:///potentially_constant_type_as.dart:30:9)

diff --git a/pkg/front_end/testcases/nnbd/potentially_constant_type_as.dart.weak.expect b/pkg/front_end/testcases/nnbd/potentially_constant_type_as.dart.weak.expect
index 752b8a6..75b5d7c 100644
--- a/pkg/front_end/testcases/nnbd/potentially_constant_type_as.dart.weak.expect
+++ b/pkg/front_end/testcases/nnbd/potentially_constant_type_as.dart.weak.expect

@@ -251,7 +251,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///potentially_constant_type_as.dart:
 - Class. (from org-dartlang-testcase:///potentially_constant_type_as.dart:16:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - ClassWithBound. (from org-dartlang-testcase:///potentially_constant_type_as.dart:22:9)
 - ClassWithBound.withValue (from org-dartlang-testcase:///potentially_constant_type_as.dart:24:9)
 - ClassWithList. (from org-dartlang-testcase:///potentially_constant_type_as.dart:30:9)

diff --git a/pkg/front_end/testcases/nnbd/potentially_constant_type_as.dart.weak.modular.expect b/pkg/front_end/testcases/nnbd/potentially_constant_type_as.dart.weak.modular.expect
index 752b8a6..75b5d7c 100644
--- a/pkg/front_end/testcases/nnbd/potentially_constant_type_as.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/nnbd/potentially_constant_type_as.dart.weak.modular.expect

@@ -251,7 +251,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///potentially_constant_type_as.dart:
 - Class. (from org-dartlang-testcase:///potentially_constant_type_as.dart:16:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - ClassWithBound. (from org-dartlang-testcase:///potentially_constant_type_as.dart:22:9)
 - ClassWithBound.withValue (from org-dartlang-testcase:///potentially_constant_type_as.dart:24:9)
 - ClassWithList. (from org-dartlang-testcase:///potentially_constant_type_as.dart:30:9)

diff --git a/pkg/front_end/testcases/nnbd/potentially_constant_type_as.dart.weak.transformed.expect b/pkg/front_end/testcases/nnbd/potentially_constant_type_as.dart.weak.transformed.expect
index 752b8a6..75b5d7c 100644
--- a/pkg/front_end/testcases/nnbd/potentially_constant_type_as.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/potentially_constant_type_as.dart.weak.transformed.expect

@@ -251,7 +251,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///potentially_constant_type_as.dart:
 - Class. (from org-dartlang-testcase:///potentially_constant_type_as.dart:16:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - ClassWithBound. (from org-dartlang-testcase:///potentially_constant_type_as.dart:22:9)
 - ClassWithBound.withValue (from org-dartlang-testcase:///potentially_constant_type_as.dart:24:9)
 - ClassWithList. (from org-dartlang-testcase:///potentially_constant_type_as.dart:30:9)

diff --git a/pkg/front_end/testcases/nnbd/potentially_constant_type_is.dart.strong.expect b/pkg/front_end/testcases/nnbd/potentially_constant_type_is.dart.strong.expect
index fb57de9..2bc7dac 100644
--- a/pkg/front_end/testcases/nnbd/potentially_constant_type_is.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/potentially_constant_type_is.dart.strong.expect

@@ -118,7 +118,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///potentially_constant_type_is.dart:
 - Class. (from org-dartlang-testcase:///potentially_constant_type_is.dart:16:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - ClassWithBound. (from org-dartlang-testcase:///potentially_constant_type_is.dart:22:9)
 - ClassWithBound.withValue (from org-dartlang-testcase:///potentially_constant_type_is.dart:24:9)
 - ClassWithList. (from org-dartlang-testcase:///potentially_constant_type_is.dart:30:9)

diff --git a/pkg/front_end/testcases/nnbd/potentially_constant_type_is.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/potentially_constant_type_is.dart.strong.transformed.expect
index fb57de9..2bc7dac 100644
--- a/pkg/front_end/testcases/nnbd/potentially_constant_type_is.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/potentially_constant_type_is.dart.strong.transformed.expect

@@ -118,7 +118,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///potentially_constant_type_is.dart:
 - Class. (from org-dartlang-testcase:///potentially_constant_type_is.dart:16:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - ClassWithBound. (from org-dartlang-testcase:///potentially_constant_type_is.dart:22:9)
 - ClassWithBound.withValue (from org-dartlang-testcase:///potentially_constant_type_is.dart:24:9)
 - ClassWithList. (from org-dartlang-testcase:///potentially_constant_type_is.dart:30:9)

diff --git a/pkg/front_end/testcases/nnbd/potentially_constant_type_is.dart.weak.expect b/pkg/front_end/testcases/nnbd/potentially_constant_type_is.dart.weak.expect
index 3b6c8a8..a68d70d 100644
--- a/pkg/front_end/testcases/nnbd/potentially_constant_type_is.dart.weak.expect
+++ b/pkg/front_end/testcases/nnbd/potentially_constant_type_is.dart.weak.expect

@@ -119,7 +119,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///potentially_constant_type_is.dart:
 - Class. (from org-dartlang-testcase:///potentially_constant_type_is.dart:16:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - ClassWithBound. (from org-dartlang-testcase:///potentially_constant_type_is.dart:22:9)
 - ClassWithBound.withValue (from org-dartlang-testcase:///potentially_constant_type_is.dart:24:9)
 - ClassWithList. (from org-dartlang-testcase:///potentially_constant_type_is.dart:30:9)

diff --git a/pkg/front_end/testcases/nnbd/potentially_constant_type_is.dart.weak.modular.expect b/pkg/front_end/testcases/nnbd/potentially_constant_type_is.dart.weak.modular.expect
index 3b6c8a8..a68d70d 100644
--- a/pkg/front_end/testcases/nnbd/potentially_constant_type_is.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/nnbd/potentially_constant_type_is.dart.weak.modular.expect

@@ -119,7 +119,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///potentially_constant_type_is.dart:
 - Class. (from org-dartlang-testcase:///potentially_constant_type_is.dart:16:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - ClassWithBound. (from org-dartlang-testcase:///potentially_constant_type_is.dart:22:9)
 - ClassWithBound.withValue (from org-dartlang-testcase:///potentially_constant_type_is.dart:24:9)
 - ClassWithList. (from org-dartlang-testcase:///potentially_constant_type_is.dart:30:9)

diff --git a/pkg/front_end/testcases/nnbd/potentially_constant_type_is.dart.weak.transformed.expect b/pkg/front_end/testcases/nnbd/potentially_constant_type_is.dart.weak.transformed.expect
index 3b6c8a8..a68d70d 100644
--- a/pkg/front_end/testcases/nnbd/potentially_constant_type_is.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/potentially_constant_type_is.dart.weak.transformed.expect

@@ -119,7 +119,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///potentially_constant_type_is.dart:
 - Class. (from org-dartlang-testcase:///potentially_constant_type_is.dart:16:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - ClassWithBound. (from org-dartlang-testcase:///potentially_constant_type_is.dart:22:9)
 - ClassWithBound.withValue (from org-dartlang-testcase:///potentially_constant_type_is.dart:24:9)
 - ClassWithList. (from org-dartlang-testcase:///potentially_constant_type_is.dart:30:9)

diff --git a/pkg/front_end/testcases/nnbd/return_null.dart.strong.expect b/pkg/front_end/testcases/nnbd/return_null.dart.strong.expect
index 2e558b3..4b53629 100644
--- a/pkg/front_end/testcases/nnbd/return_null.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/return_null.dart.strong.expect

@@ -233,5 +233,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///return_null.dart:
 - Enum. (from org-dartlang-testcase:///return_null.dart:43:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/return_null.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/return_null.dart.strong.transformed.expect
index 961fd5b..77ffe7b 100644
--- a/pkg/front_end/testcases/nnbd/return_null.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/return_null.dart.strong.transformed.expect

@@ -233,5 +233,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///return_null.dart:
 - Enum. (from org-dartlang-testcase:///return_null.dart:43:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/return_null.dart.weak.expect b/pkg/front_end/testcases/nnbd/return_null.dart.weak.expect
index affb3d2..3a5146a 100644
--- a/pkg/front_end/testcases/nnbd/return_null.dart.weak.expect
+++ b/pkg/front_end/testcases/nnbd/return_null.dart.weak.expect

@@ -240,5 +240,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///return_null.dart:
 - Enum. (from org-dartlang-testcase:///return_null.dart:43:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/return_null.dart.weak.modular.expect b/pkg/front_end/testcases/nnbd/return_null.dart.weak.modular.expect
index affb3d2..3a5146a 100644
--- a/pkg/front_end/testcases/nnbd/return_null.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/nnbd/return_null.dart.weak.modular.expect

@@ -240,5 +240,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///return_null.dart:
 - Enum. (from org-dartlang-testcase:///return_null.dart:43:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/return_null.dart.weak.transformed.expect b/pkg/front_end/testcases/nnbd/return_null.dart.weak.transformed.expect
index f2e3ba6..1ffefac 100644
--- a/pkg/front_end/testcases/nnbd/return_null.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/return_null.dart.weak.transformed.expect

@@ -240,5 +240,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///return_null.dart:
 - Enum. (from org-dartlang-testcase:///return_null.dart:43:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/switch_nullable_enum.dart.strong.expect b/pkg/front_end/testcases/nnbd/switch_nullable_enum.dart.strong.expect
index d4f91be..53e0491 100644
--- a/pkg/front_end/testcases/nnbd/switch_nullable_enum.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/switch_nullable_enum.dart.strong.expect

@@ -113,5 +113,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///switch_nullable_enum.dart:
 - Enum. (from org-dartlang-testcase:///switch_nullable_enum.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/switch_nullable_enum.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/switch_nullable_enum.dart.strong.transformed.expect
index d4f91be..53e0491 100644
--- a/pkg/front_end/testcases/nnbd/switch_nullable_enum.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/switch_nullable_enum.dart.strong.transformed.expect

@@ -113,5 +113,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///switch_nullable_enum.dart:
 - Enum. (from org-dartlang-testcase:///switch_nullable_enum.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/switch_nullable_enum.dart.weak.expect b/pkg/front_end/testcases/nnbd/switch_nullable_enum.dart.weak.expect
index 6a960bc..a4d79c1 100644
--- a/pkg/front_end/testcases/nnbd/switch_nullable_enum.dart.weak.expect
+++ b/pkg/front_end/testcases/nnbd/switch_nullable_enum.dart.weak.expect

@@ -117,5 +117,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///switch_nullable_enum.dart:
 - Enum. (from org-dartlang-testcase:///switch_nullable_enum.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/switch_nullable_enum.dart.weak.modular.expect b/pkg/front_end/testcases/nnbd/switch_nullable_enum.dart.weak.modular.expect
index 6a960bc..a4d79c1 100644
--- a/pkg/front_end/testcases/nnbd/switch_nullable_enum.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/nnbd/switch_nullable_enum.dart.weak.modular.expect

@@ -117,5 +117,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///switch_nullable_enum.dart:
 - Enum. (from org-dartlang-testcase:///switch_nullable_enum.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/switch_nullable_enum.dart.weak.transformed.expect b/pkg/front_end/testcases/nnbd/switch_nullable_enum.dart.weak.transformed.expect
index 6a960bc..a4d79c1 100644
--- a/pkg/front_end/testcases/nnbd/switch_nullable_enum.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/switch_nullable_enum.dart.weak.transformed.expect

@@ -117,5 +117,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///switch_nullable_enum.dart:
 - Enum. (from org-dartlang-testcase:///switch_nullable_enum.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd/switch_redesign_types.dart.strong.expect b/pkg/front_end/testcases/nnbd/switch_redesign_types.dart.strong.expect
index 0d7d320..8ed0307 100644
--- a/pkg/front_end/testcases/nnbd/switch_redesign_types.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/switch_redesign_types.dart.strong.expect

@@ -106,5 +106,5 @@
 - D. (from org-dartlang-testcase:///switch_redesign_types.dart:23:9)
 - B. (from org-dartlang-testcase:///switch_redesign_types.dart:15:9)
 - A. (from org-dartlang-testcase:///switch_redesign_types.dart:11:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - C. (from org-dartlang-testcase:///switch_redesign_types.dart:19:9)

diff --git a/pkg/front_end/testcases/nnbd/switch_redesign_types.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/switch_redesign_types.dart.strong.transformed.expect
index 0d7d320..8ed0307 100644
--- a/pkg/front_end/testcases/nnbd/switch_redesign_types.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/switch_redesign_types.dart.strong.transformed.expect

@@ -106,5 +106,5 @@
 - D. (from org-dartlang-testcase:///switch_redesign_types.dart:23:9)
 - B. (from org-dartlang-testcase:///switch_redesign_types.dart:15:9)
 - A. (from org-dartlang-testcase:///switch_redesign_types.dart:11:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - C. (from org-dartlang-testcase:///switch_redesign_types.dart:19:9)

diff --git a/pkg/front_end/testcases/nnbd/switch_redesign_types.dart.weak.expect b/pkg/front_end/testcases/nnbd/switch_redesign_types.dart.weak.expect
index 0d7d320..8ed0307 100644
--- a/pkg/front_end/testcases/nnbd/switch_redesign_types.dart.weak.expect
+++ b/pkg/front_end/testcases/nnbd/switch_redesign_types.dart.weak.expect

@@ -106,5 +106,5 @@
 - D. (from org-dartlang-testcase:///switch_redesign_types.dart:23:9)
 - B. (from org-dartlang-testcase:///switch_redesign_types.dart:15:9)
 - A. (from org-dartlang-testcase:///switch_redesign_types.dart:11:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - C. (from org-dartlang-testcase:///switch_redesign_types.dart:19:9)

diff --git a/pkg/front_end/testcases/nnbd/switch_redesign_types.dart.weak.modular.expect b/pkg/front_end/testcases/nnbd/switch_redesign_types.dart.weak.modular.expect
index 0d7d320..8ed0307 100644
--- a/pkg/front_end/testcases/nnbd/switch_redesign_types.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/nnbd/switch_redesign_types.dart.weak.modular.expect

@@ -106,5 +106,5 @@
 - D. (from org-dartlang-testcase:///switch_redesign_types.dart:23:9)
 - B. (from org-dartlang-testcase:///switch_redesign_types.dart:15:9)
 - A. (from org-dartlang-testcase:///switch_redesign_types.dart:11:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - C. (from org-dartlang-testcase:///switch_redesign_types.dart:19:9)

diff --git a/pkg/front_end/testcases/nnbd/switch_redesign_types.dart.weak.transformed.expect b/pkg/front_end/testcases/nnbd/switch_redesign_types.dart.weak.transformed.expect
index 0d7d320..8ed0307 100644
--- a/pkg/front_end/testcases/nnbd/switch_redesign_types.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/switch_redesign_types.dart.weak.transformed.expect

@@ -106,5 +106,5 @@
 - D. (from org-dartlang-testcase:///switch_redesign_types.dart:23:9)
 - B. (from org-dartlang-testcase:///switch_redesign_types.dart:15:9)
 - A. (from org-dartlang-testcase:///switch_redesign_types.dart:11:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - C. (from org-dartlang-testcase:///switch_redesign_types.dart:19:9)

diff --git a/pkg/front_end/testcases/nnbd_mixed/const_canonical_type.dart.weak.expect b/pkg/front_end/testcases/nnbd_mixed/const_canonical_type.dart.weak.expect
index 50d1579..f125c4d 100644
--- a/pkg/front_end/testcases/nnbd_mixed/const_canonical_type.dart.weak.expect
+++ b/pkg/front_end/testcases/nnbd_mixed/const_canonical_type.dart.weak.expect

@@ -111,9 +111,9 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_canonical_type.dart:
 - A. (from org-dartlang-testcase:///const_canonical_type_lib.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Check. (from org-dartlang-testcase:///const_canonical_type.dart:11:9)
 
 org-dartlang-testcase:///const_canonical_type_lib.dart:
 - A. (from org-dartlang-testcase:///const_canonical_type_lib.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd_mixed/const_canonical_type.dart.weak.modular.expect b/pkg/front_end/testcases/nnbd_mixed/const_canonical_type.dart.weak.modular.expect
index 50d1579..f125c4d 100644
--- a/pkg/front_end/testcases/nnbd_mixed/const_canonical_type.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/nnbd_mixed/const_canonical_type.dart.weak.modular.expect

@@ -111,9 +111,9 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_canonical_type.dart:
 - A. (from org-dartlang-testcase:///const_canonical_type_lib.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Check. (from org-dartlang-testcase:///const_canonical_type.dart:11:9)
 
 org-dartlang-testcase:///const_canonical_type_lib.dart:
 - A. (from org-dartlang-testcase:///const_canonical_type_lib.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd_mixed/const_canonical_type.dart.weak.transformed.expect b/pkg/front_end/testcases/nnbd_mixed/const_canonical_type.dart.weak.transformed.expect
index 50d1579..f125c4d 100644
--- a/pkg/front_end/testcases/nnbd_mixed/const_canonical_type.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/nnbd_mixed/const_canonical_type.dart.weak.transformed.expect

@@ -111,9 +111,9 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///const_canonical_type.dart:
 - A. (from org-dartlang-testcase:///const_canonical_type_lib.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Check. (from org-dartlang-testcase:///const_canonical_type.dart:11:9)
 
 org-dartlang-testcase:///const_canonical_type_lib.dart:
 - A. (from org-dartlang-testcase:///const_canonical_type_lib.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd_mixed/constant_null_is.dart.weak.expect b/pkg/front_end/testcases/nnbd_mixed/constant_null_is.dart.weak.expect
index 69b11ec..8ee7f7d 100644
--- a/pkg/front_end/testcases/nnbd_mixed/constant_null_is.dart.weak.expect
+++ b/pkg/front_end/testcases/nnbd_mixed/constant_null_is.dart.weak.expect

@@ -131,14 +131,14 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///constant_null_is.dart:
 - Class.constructor1 (from org-dartlang-testcase:///constant_null_is.dart:39:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Class.constructor2 (from org-dartlang-testcase:///constant_null_is.dart:40:9)
 - Class.constructor3 (from org-dartlang-testcase:///constant_null_is.dart:41:9)
 - Class.constructor4 (from org-dartlang-testcase:///constant_null_is.dart:42:9)
 
 org-dartlang-testcase:///constant_null_is_lib.dart:
 - Class.constructor1 (from org-dartlang-testcase:///constant_null_is.dart:39:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Class.constructor2 (from org-dartlang-testcase:///constant_null_is.dart:40:9)
 - Class.constructor3 (from org-dartlang-testcase:///constant_null_is.dart:41:9)
 - Class.constructor4 (from org-dartlang-testcase:///constant_null_is.dart:42:9)

diff --git a/pkg/front_end/testcases/nnbd_mixed/constant_null_is.dart.weak.modular.expect b/pkg/front_end/testcases/nnbd_mixed/constant_null_is.dart.weak.modular.expect
index 69b11ec..8ee7f7d 100644
--- a/pkg/front_end/testcases/nnbd_mixed/constant_null_is.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/nnbd_mixed/constant_null_is.dart.weak.modular.expect

@@ -131,14 +131,14 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///constant_null_is.dart:
 - Class.constructor1 (from org-dartlang-testcase:///constant_null_is.dart:39:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Class.constructor2 (from org-dartlang-testcase:///constant_null_is.dart:40:9)
 - Class.constructor3 (from org-dartlang-testcase:///constant_null_is.dart:41:9)
 - Class.constructor4 (from org-dartlang-testcase:///constant_null_is.dart:42:9)
 
 org-dartlang-testcase:///constant_null_is_lib.dart:
 - Class.constructor1 (from org-dartlang-testcase:///constant_null_is.dart:39:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Class.constructor2 (from org-dartlang-testcase:///constant_null_is.dart:40:9)
 - Class.constructor3 (from org-dartlang-testcase:///constant_null_is.dart:41:9)
 - Class.constructor4 (from org-dartlang-testcase:///constant_null_is.dart:42:9)

diff --git a/pkg/front_end/testcases/nnbd_mixed/constant_null_is.dart.weak.transformed.expect b/pkg/front_end/testcases/nnbd_mixed/constant_null_is.dart.weak.transformed.expect
index 78c4958..6262b33 100644
--- a/pkg/front_end/testcases/nnbd_mixed/constant_null_is.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/nnbd_mixed/constant_null_is.dart.weak.transformed.expect

@@ -150,14 +150,14 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///constant_null_is.dart:
 - Class.constructor1 (from org-dartlang-testcase:///constant_null_is.dart:39:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Class.constructor2 (from org-dartlang-testcase:///constant_null_is.dart:40:9)
 - Class.constructor3 (from org-dartlang-testcase:///constant_null_is.dart:41:9)
 - Class.constructor4 (from org-dartlang-testcase:///constant_null_is.dart:42:9)
 
 org-dartlang-testcase:///constant_null_is_lib.dart:
 - Class.constructor1 (from org-dartlang-testcase:///constant_null_is.dart:39:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Class.constructor2 (from org-dartlang-testcase:///constant_null_is.dart:40:9)
 - Class.constructor3 (from org-dartlang-testcase:///constant_null_is.dart:41:9)
 - Class.constructor4 (from org-dartlang-testcase:///constant_null_is.dart:42:9)

diff --git a/pkg/front_end/testcases/nnbd_mixed/constants.dart.weak.expect b/pkg/front_end/testcases/nnbd_mixed/constants.dart.weak.expect
index f72fa11..3328a07 100644
--- a/pkg/front_end/testcases/nnbd_mixed/constants.dart.weak.expect
+++ b/pkg/front_end/testcases/nnbd_mixed/constants.dart.weak.expect

@@ -97,8 +97,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///constants.dart:
 - Class. (from org-dartlang-testcase:///constants_lib.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 org-dartlang-testcase:///constants_lib.dart:
 - Class. (from org-dartlang-testcase:///constants_lib.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd_mixed/constants.dart.weak.modular.expect b/pkg/front_end/testcases/nnbd_mixed/constants.dart.weak.modular.expect
index f72fa11..3328a07 100644
--- a/pkg/front_end/testcases/nnbd_mixed/constants.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/nnbd_mixed/constants.dart.weak.modular.expect

@@ -97,8 +97,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///constants.dart:
 - Class. (from org-dartlang-testcase:///constants_lib.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 org-dartlang-testcase:///constants_lib.dart:
 - Class. (from org-dartlang-testcase:///constants_lib.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd_mixed/constants.dart.weak.transformed.expect b/pkg/front_end/testcases/nnbd_mixed/constants.dart.weak.transformed.expect
index f72fa11..3328a07 100644
--- a/pkg/front_end/testcases/nnbd_mixed/constants.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/nnbd_mixed/constants.dart.weak.transformed.expect

@@ -97,8 +97,8 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///constants.dart:
 - Class. (from org-dartlang-testcase:///constants_lib.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 
 org-dartlang-testcase:///constants_lib.dart:
 - Class. (from org-dartlang-testcase:///constants_lib.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd_mixed/literal_from_opt_in.dart.weak.expect b/pkg/front_end/testcases/nnbd_mixed/literal_from_opt_in.dart.weak.expect
index 6c3539d..3617a0b 100644
--- a/pkg/front_end/testcases/nnbd_mixed/literal_from_opt_in.dart.weak.expect
+++ b/pkg/front_end/testcases/nnbd_mixed/literal_from_opt_in.dart.weak.expect

@@ -45,4 +45,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///literal_from_opt_in_lib.dart:
 - Const. (from org-dartlang-testcase:///literal_from_opt_in_lib.dart:8:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd_mixed/literal_from_opt_in.dart.weak.modular.expect b/pkg/front_end/testcases/nnbd_mixed/literal_from_opt_in.dart.weak.modular.expect
index 6c3539d..3617a0b 100644
--- a/pkg/front_end/testcases/nnbd_mixed/literal_from_opt_in.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/nnbd_mixed/literal_from_opt_in.dart.weak.modular.expect

@@ -45,4 +45,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///literal_from_opt_in_lib.dart:
 - Const. (from org-dartlang-testcase:///literal_from_opt_in_lib.dart:8:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd_mixed/literal_from_opt_in.dart.weak.transformed.expect b/pkg/front_end/testcases/nnbd_mixed/literal_from_opt_in.dart.weak.transformed.expect
index 6c3539d..3617a0b 100644
--- a/pkg/front_end/testcases/nnbd_mixed/literal_from_opt_in.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/nnbd_mixed/literal_from_opt_in.dart.weak.transformed.expect

@@ -45,4 +45,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///literal_from_opt_in_lib.dart:
 - Const. (from org-dartlang-testcase:///literal_from_opt_in_lib.dart:8:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd_mixed/object_bound_factory/main.dart.weak.expect b/pkg/front_end/testcases/nnbd_mixed/object_bound_factory/main.dart.weak.expect
index e605bd9..db57c76 100644
--- a/pkg/front_end/testcases/nnbd_mixed/object_bound_factory/main.dart.weak.expect
+++ b/pkg/front_end/testcases/nnbd_mixed/object_bound_factory/main.dart.weak.expect

@@ -139,7 +139,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///main.dart:
 - Class1._ (from org-dartlang-testcase:///opt_in_lib.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Class2._ (from org-dartlang-testcase:///opt_in_lib.dart:18:9)
 - Class3._ (from org-dartlang-testcase:///opt_in_lib.dart:26:9)
 - Class4._ (from org-dartlang-testcase:///opt_in_lib.dart:34:9)
@@ -147,7 +147,7 @@
 
 org-dartlang-testcase:///opt_in_lib.dart:
 - Class1._ (from org-dartlang-testcase:///opt_in_lib.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Class2._ (from org-dartlang-testcase:///opt_in_lib.dart:18:9)
 - Class3._ (from org-dartlang-testcase:///opt_in_lib.dart:26:9)
 - Class4._ (from org-dartlang-testcase:///opt_in_lib.dart:34:9)

diff --git a/pkg/front_end/testcases/nnbd_mixed/object_bound_factory/main.dart.weak.modular.expect b/pkg/front_end/testcases/nnbd_mixed/object_bound_factory/main.dart.weak.modular.expect
index e605bd9..db57c76 100644
--- a/pkg/front_end/testcases/nnbd_mixed/object_bound_factory/main.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/nnbd_mixed/object_bound_factory/main.dart.weak.modular.expect

@@ -139,7 +139,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///main.dart:
 - Class1._ (from org-dartlang-testcase:///opt_in_lib.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Class2._ (from org-dartlang-testcase:///opt_in_lib.dart:18:9)
 - Class3._ (from org-dartlang-testcase:///opt_in_lib.dart:26:9)
 - Class4._ (from org-dartlang-testcase:///opt_in_lib.dart:34:9)
@@ -147,7 +147,7 @@
 
 org-dartlang-testcase:///opt_in_lib.dart:
 - Class1._ (from org-dartlang-testcase:///opt_in_lib.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Class2._ (from org-dartlang-testcase:///opt_in_lib.dart:18:9)
 - Class3._ (from org-dartlang-testcase:///opt_in_lib.dart:26:9)
 - Class4._ (from org-dartlang-testcase:///opt_in_lib.dart:34:9)

diff --git a/pkg/front_end/testcases/nnbd_mixed/object_bound_factory/main.dart.weak.transformed.expect b/pkg/front_end/testcases/nnbd_mixed/object_bound_factory/main.dart.weak.transformed.expect
index e605bd9..db57c76 100644
--- a/pkg/front_end/testcases/nnbd_mixed/object_bound_factory/main.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/nnbd_mixed/object_bound_factory/main.dart.weak.transformed.expect

@@ -139,7 +139,7 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///main.dart:
 - Class1._ (from org-dartlang-testcase:///opt_in_lib.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Class2._ (from org-dartlang-testcase:///opt_in_lib.dart:18:9)
 - Class3._ (from org-dartlang-testcase:///opt_in_lib.dart:26:9)
 - Class4._ (from org-dartlang-testcase:///opt_in_lib.dart:34:9)
@@ -147,7 +147,7 @@
 
 org-dartlang-testcase:///opt_in_lib.dart:
 - Class1._ (from org-dartlang-testcase:///opt_in_lib.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - Class2._ (from org-dartlang-testcase:///opt_in_lib.dart:18:9)
 - Class3._ (from org-dartlang-testcase:///opt_in_lib.dart:26:9)
 - Class4._ (from org-dartlang-testcase:///opt_in_lib.dart:34:9)

diff --git a/pkg/front_end/testcases/nnbd_mixed/object_bound_redirecting_factory/main.dart.weak.expect b/pkg/front_end/testcases/nnbd_mixed/object_bound_redirecting_factory/main.dart.weak.expect
index 342dcae..5670ff8 100644
--- a/pkg/front_end/testcases/nnbd_mixed/object_bound_redirecting_factory/main.dart.weak.expect
+++ b/pkg/front_end/testcases/nnbd_mixed/object_bound_redirecting_factory/main.dart.weak.expect

@@ -94,7 +94,7 @@
 org-dartlang-testcase:///main.dart:
 - CP._ (from org-dartlang-testcase:///opt_in_lib.dart:14:9)
 - P._ (from org-dartlang-testcase:///opt_in_lib.dart:8:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - XToken. (from org-dartlang-testcase:///main.dart:12:9)
 - Token. (from org-dartlang-testcase:///opt_in_lib.dart:18:9)
 - VP._ (from org-dartlang-testcase:///opt_in_lib.dart:27:9)

diff --git a/pkg/front_end/testcases/nnbd_mixed/object_bound_redirecting_factory/main.dart.weak.modular.expect b/pkg/front_end/testcases/nnbd_mixed/object_bound_redirecting_factory/main.dart.weak.modular.expect
index 342dcae..5670ff8 100644
--- a/pkg/front_end/testcases/nnbd_mixed/object_bound_redirecting_factory/main.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/nnbd_mixed/object_bound_redirecting_factory/main.dart.weak.modular.expect

@@ -94,7 +94,7 @@
 org-dartlang-testcase:///main.dart:
 - CP._ (from org-dartlang-testcase:///opt_in_lib.dart:14:9)
 - P._ (from org-dartlang-testcase:///opt_in_lib.dart:8:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - XToken. (from org-dartlang-testcase:///main.dart:12:9)
 - Token. (from org-dartlang-testcase:///opt_in_lib.dart:18:9)
 - VP._ (from org-dartlang-testcase:///opt_in_lib.dart:27:9)

diff --git a/pkg/front_end/testcases/nnbd_mixed/object_bound_redirecting_factory/main.dart.weak.transformed.expect b/pkg/front_end/testcases/nnbd_mixed/object_bound_redirecting_factory/main.dart.weak.transformed.expect
index 342dcae..5670ff8 100644
--- a/pkg/front_end/testcases/nnbd_mixed/object_bound_redirecting_factory/main.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/nnbd_mixed/object_bound_redirecting_factory/main.dart.weak.transformed.expect

@@ -94,7 +94,7 @@
 org-dartlang-testcase:///main.dart:
 - CP._ (from org-dartlang-testcase:///opt_in_lib.dart:14:9)
 - P._ (from org-dartlang-testcase:///opt_in_lib.dart:8:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - XToken. (from org-dartlang-testcase:///main.dart:12:9)
 - Token. (from org-dartlang-testcase:///opt_in_lib.dart:18:9)
 - VP._ (from org-dartlang-testcase:///opt_in_lib.dart:27:9)

diff --git a/pkg/front_end/testcases/nnbd_mixed/unsound_checks.dart.weak.expect b/pkg/front_end/testcases/nnbd_mixed/unsound_checks.dart.weak.expect
index 4cd4db8..7aa1771 100644
--- a/pkg/front_end/testcases/nnbd_mixed/unsound_checks.dart.weak.expect
+++ b/pkg/front_end/testcases/nnbd_mixed/unsound_checks.dart.weak.expect

@@ -622,5 +622,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///unsound_checks_lib.dart:
 - E. (from org-dartlang-testcase:///unsound_checks_lib.dart:145:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd_mixed/unsound_checks.dart.weak.modular.expect b/pkg/front_end/testcases/nnbd_mixed/unsound_checks.dart.weak.modular.expect
index 4cd4db8..7aa1771 100644
--- a/pkg/front_end/testcases/nnbd_mixed/unsound_checks.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/nnbd_mixed/unsound_checks.dart.weak.modular.expect

@@ -622,5 +622,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///unsound_checks_lib.dart:
 - E. (from org-dartlang-testcase:///unsound_checks_lib.dart:145:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/nnbd_mixed/unsound_checks.dart.weak.transformed.expect b/pkg/front_end/testcases/nnbd_mixed/unsound_checks.dart.weak.transformed.expect
index f502ea8..ed85b12 100644
--- a/pkg/front_end/testcases/nnbd_mixed/unsound_checks.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/nnbd_mixed/unsound_checks.dart.weak.transformed.expect

@@ -643,5 +643,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///unsound_checks_lib.dart:
 - E. (from org-dartlang-testcase:///unsound_checks_lib.dart:145:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/rasta/enum.dart.weak.expect b/pkg/front_end/testcases/rasta/enum.dart.weak.expect
index 72fd4bf..f9f472d 100644
--- a/pkg/front_end/testcases/rasta/enum.dart.weak.expect
+++ b/pkg/front_end/testcases/rasta/enum.dart.weak.expect

@@ -28,5 +28,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///enum.dart:
 - Foo. (from org-dartlang-testcase:///enum.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/rasta/enum.dart.weak.modular.expect b/pkg/front_end/testcases/rasta/enum.dart.weak.modular.expect
index 72fd4bf..f9f472d 100644
--- a/pkg/front_end/testcases/rasta/enum.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/rasta/enum.dart.weak.modular.expect

@@ -28,5 +28,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///enum.dart:
 - Foo. (from org-dartlang-testcase:///enum.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/rasta/enum.dart.weak.transformed.expect b/pkg/front_end/testcases/rasta/enum.dart.weak.transformed.expect
index 72fd4bf..f9f472d 100644
--- a/pkg/front_end/testcases/rasta/enum.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/rasta/enum.dart.weak.transformed.expect

@@ -28,5 +28,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///enum.dart:
 - Foo. (from org-dartlang-testcase:///enum.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/rasta/issue_000044.dart.weak.expect b/pkg/front_end/testcases/rasta/issue_000044.dart.weak.expect
index 986d518..8be23a3 100644
--- a/pkg/front_end/testcases/rasta/issue_000044.dart.weak.expect
+++ b/pkg/front_end/testcases/rasta/issue_000044.dart.weak.expect

@@ -102,4 +102,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue_000044.dart:
 - C.constant (from org-dartlang-testcase:///issue_000044.dart:11:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/rasta/issue_000044.dart.weak.modular.expect b/pkg/front_end/testcases/rasta/issue_000044.dart.weak.modular.expect
index 986d518..8be23a3 100644
--- a/pkg/front_end/testcases/rasta/issue_000044.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/rasta/issue_000044.dart.weak.modular.expect

@@ -102,4 +102,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue_000044.dart:
 - C.constant (from org-dartlang-testcase:///issue_000044.dart:11:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/rasta/issue_000044.dart.weak.transformed.expect b/pkg/front_end/testcases/rasta/issue_000044.dart.weak.transformed.expect
index 2578fd4..6f2d6b6 100644
--- a/pkg/front_end/testcases/rasta/issue_000044.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/rasta/issue_000044.dart.weak.transformed.expect

@@ -102,4 +102,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue_000044.dart:
 - C.constant (from org-dartlang-testcase:///issue_000044.dart:11:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/rasta/issue_000070.dart.weak.expect b/pkg/front_end/testcases/rasta/issue_000070.dart.weak.expect
index 1c80364..211a657 100644
--- a/pkg/front_end/testcases/rasta/issue_000070.dart.weak.expect
+++ b/pkg/front_end/testcases/rasta/issue_000070.dart.weak.expect

@@ -54,4 +54,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue_000070.dart:
 - A.c (from org-dartlang-testcase:///issue_000070.dart:22:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/rasta/issue_000070.dart.weak.modular.expect b/pkg/front_end/testcases/rasta/issue_000070.dart.weak.modular.expect
index 1c80364..211a657 100644
--- a/pkg/front_end/testcases/rasta/issue_000070.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/rasta/issue_000070.dart.weak.modular.expect

@@ -54,4 +54,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue_000070.dart:
 - A.c (from org-dartlang-testcase:///issue_000070.dart:22:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/rasta/issue_000070.dart.weak.transformed.expect b/pkg/front_end/testcases/rasta/issue_000070.dart.weak.transformed.expect
index fc604245..140da89 100644
--- a/pkg/front_end/testcases/rasta/issue_000070.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/rasta/issue_000070.dart.weak.transformed.expect

@@ -54,4 +54,4 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue_000070.dart:
 - A.c (from org-dartlang-testcase:///issue_000070.dart:22:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/rasta/native_is_illegal.dart.weak.expect b/pkg/front_end/testcases/rasta/native_is_illegal.dart.weak.expect
index 09d6406..41e61d9 100644
--- a/pkg/front_end/testcases/rasta/native_is_illegal.dart.weak.expect
+++ b/pkg/front_end/testcases/rasta/native_is_illegal.dart.weak.expect

@@ -32,5 +32,5 @@
 
 Constructor coverage from constants:
 org-dartlang-testcase:///native_is_illegal.dart:
-- ExternalName. (from org-dartlang-sdk:///sdk/lib/internal/internal.dart:109:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- ExternalName. (from org-dartlang-sdk:///sdk/lib/internal/internal.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/rasta/native_is_illegal.dart.weak.modular.expect b/pkg/front_end/testcases/rasta/native_is_illegal.dart.weak.modular.expect
index 09d6406..41e61d9 100644
--- a/pkg/front_end/testcases/rasta/native_is_illegal.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/rasta/native_is_illegal.dart.weak.modular.expect

@@ -32,5 +32,5 @@
 
 Constructor coverage from constants:
 org-dartlang-testcase:///native_is_illegal.dart:
-- ExternalName. (from org-dartlang-sdk:///sdk/lib/internal/internal.dart:109:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- ExternalName. (from org-dartlang-sdk:///sdk/lib/internal/internal.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/rasta/native_is_illegal.dart.weak.transformed.expect b/pkg/front_end/testcases/rasta/native_is_illegal.dart.weak.transformed.expect
index 09d6406..41e61d9 100644
--- a/pkg/front_end/testcases/rasta/native_is_illegal.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/rasta/native_is_illegal.dart.weak.transformed.expect

@@ -32,5 +32,5 @@
 
 Constructor coverage from constants:
 org-dartlang-testcase:///native_is_illegal.dart:
-- ExternalName. (from org-dartlang-sdk:///sdk/lib/internal/internal.dart:109:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- ExternalName. (from org-dartlang-sdk:///sdk/lib/internal/internal.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/regress/issue_34403.dart.weak.expect b/pkg/front_end/testcases/regress/issue_34403.dart.weak.expect
index 2d0471d..ae15fb0 100644
--- a/pkg/front_end/testcases/regress/issue_34403.dart.weak.expect
+++ b/pkg/front_end/testcases/regress/issue_34403.dart.weak.expect

@@ -184,5 +184,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue_34403.dart:
 - D.foo (from org-dartlang-testcase:///issue_34403.dart:14:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - F.foo (from org-dartlang-testcase:///issue_34403_lib.dart:12:9)

diff --git a/pkg/front_end/testcases/regress/issue_34403.dart.weak.modular.expect b/pkg/front_end/testcases/regress/issue_34403.dart.weak.modular.expect
index 2d0471d..ae15fb0 100644
--- a/pkg/front_end/testcases/regress/issue_34403.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/regress/issue_34403.dart.weak.modular.expect

@@ -184,5 +184,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue_34403.dart:
 - D.foo (from org-dartlang-testcase:///issue_34403.dart:14:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - F.foo (from org-dartlang-testcase:///issue_34403_lib.dart:12:9)

diff --git a/pkg/front_end/testcases/regress/issue_34403.dart.weak.transformed.expect b/pkg/front_end/testcases/regress/issue_34403.dart.weak.transformed.expect
index 2d0471d..ae15fb0 100644
--- a/pkg/front_end/testcases/regress/issue_34403.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/regress/issue_34403.dart.weak.transformed.expect

@@ -184,5 +184,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue_34403.dart:
 - D.foo (from org-dartlang-testcase:///issue_34403.dart:14:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - F.foo (from org-dartlang-testcase:///issue_34403_lib.dart:12:9)

diff --git a/pkg/front_end/testcases/regress/issue_34403_2.dart.weak.expect b/pkg/front_end/testcases/regress/issue_34403_2.dart.weak.expect
index bb6af05..f0d6b81 100644
--- a/pkg/front_end/testcases/regress/issue_34403_2.dart.weak.expect
+++ b/pkg/front_end/testcases/regress/issue_34403_2.dart.weak.expect

@@ -152,5 +152,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue_34403_2.dart:
 - D.foo (from org-dartlang-testcase:///issue_34403_2.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - F.foo (from org-dartlang-testcase:///issue_34403_lib.dart:12:9)

diff --git a/pkg/front_end/testcases/regress/issue_34403_2.dart.weak.modular.expect b/pkg/front_end/testcases/regress/issue_34403_2.dart.weak.modular.expect
index bb6af05..f0d6b81 100644
--- a/pkg/front_end/testcases/regress/issue_34403_2.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/regress/issue_34403_2.dart.weak.modular.expect

@@ -152,5 +152,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue_34403_2.dart:
 - D.foo (from org-dartlang-testcase:///issue_34403_2.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - F.foo (from org-dartlang-testcase:///issue_34403_lib.dart:12:9)

diff --git a/pkg/front_end/testcases/regress/issue_34403_2.dart.weak.transformed.expect b/pkg/front_end/testcases/regress/issue_34403_2.dart.weak.transformed.expect
index bb6af05..f0d6b81 100644
--- a/pkg/front_end/testcases/regress/issue_34403_2.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/regress/issue_34403_2.dart.weak.transformed.expect

@@ -152,5 +152,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///issue_34403_2.dart:
 - D.foo (from org-dartlang-testcase:///issue_34403_2.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
 - F.foo (from org-dartlang-testcase:///issue_34403_lib.dart:12:9)

diff --git a/pkg/front_end/testcases/static_field_lowering/enum.dart.strong.expect b/pkg/front_end/testcases/static_field_lowering/enum.dart.strong.expect
index f7a4335..25232f8 100644
--- a/pkg/front_end/testcases/static_field_lowering/enum.dart.strong.expect
+++ b/pkg/front_end/testcases/static_field_lowering/enum.dart.strong.expect

@@ -28,5 +28,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///enum.dart:
 - A. (from org-dartlang-testcase:///enum.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/static_field_lowering/enum.dart.strong.transformed.expect b/pkg/front_end/testcases/static_field_lowering/enum.dart.strong.transformed.expect
index f7a4335..25232f8 100644
--- a/pkg/front_end/testcases/static_field_lowering/enum.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/static_field_lowering/enum.dart.strong.transformed.expect

@@ -28,5 +28,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///enum.dart:
 - A. (from org-dartlang-testcase:///enum.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/static_field_lowering/enum.dart.weak.expect b/pkg/front_end/testcases/static_field_lowering/enum.dart.weak.expect
index 18c3676..da19c7f 100644
--- a/pkg/front_end/testcases/static_field_lowering/enum.dart.weak.expect
+++ b/pkg/front_end/testcases/static_field_lowering/enum.dart.weak.expect

@@ -28,5 +28,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///enum.dart:
 - A. (from org-dartlang-testcase:///enum.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/static_field_lowering/enum.dart.weak.modular.expect b/pkg/front_end/testcases/static_field_lowering/enum.dart.weak.modular.expect
index 18c3676..da19c7f 100644
--- a/pkg/front_end/testcases/static_field_lowering/enum.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/static_field_lowering/enum.dart.weak.modular.expect

@@ -28,5 +28,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///enum.dart:
 - A. (from org-dartlang-testcase:///enum.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/pkg/front_end/testcases/static_field_lowering/enum.dart.weak.transformed.expect b/pkg/front_end/testcases/static_field_lowering/enum.dart.weak.transformed.expect
index 18c3676..da19c7f 100644
--- a/pkg/front_end/testcases/static_field_lowering/enum.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/static_field_lowering/enum.dart.weak.transformed.expect

@@ -28,5 +28,5 @@
 Constructor coverage from constants:
 org-dartlang-testcase:///enum.dart:
 - A. (from org-dartlang-testcase:///enum.dart:5:6)
-- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart:103:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- _Enum. (from org-dartlang-sdk:///sdk/lib/core/enum.dart)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)

diff --git a/tools/VERSION b/tools/VERSION
index af2d161..ff4ad65 100644
--- a/tools/VERSION
+++ b/tools/VERSION

@@ -27,5 +27,5 @@
 MAJOR 2
 MINOR 18
 PATCH 0
-PRERELEASE 279
+PRERELEASE 280
 PRERELEASE_PATCH 0
\ No newline at end of file
commit	d2df2ba0b8435275c42cd980e835c770ca962193	[log] [tgz]
author	Dart CI <dart-internal-sdk-dev-roller@dart-ci-internal.iam.gserviceaccount.com>	Wed Jul 13 01:44:11 2022 -0700
committer	Dart CI <dart-internal-sdk-dev-roller@dart-ci-internal.iam.gserviceaccount.com>	Wed Jul 13 01:44:11 2022 -0700
tree	d2c640c80fba93a171c5bc4eaf284a8e2bdccba4
parent	270181685689456a5507281c3f35f51238653578 [diff]
parent	29d7be011e5450fb01f4604affd93f2fb13bb8bf [diff]