[kernel] ast-to-text: Print uri in more places
Constructors (say from a macro), typedefs (maybe from a part) and
FileUriExpression in general didn't write their file uri when different
from their surrounding container.
Change-Id: I70dc8cbb525a6fc2c1949e0d1fb1726ac19c6505
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/368566
Commit-Queue: Jens Johansen <jensj@google.com>
Reviewed-by: Johnni Winther <johnniwinther@google.com>
diff --git a/pkg/front_end/test/macros/application/data/tests/data_class.dart.expect b/pkg/front_end/test/macros/application/data/tests/data_class.dart.expect
index 451bcf8..706dd9d 100644
--- a/pkg/front_end/test/macros/application/data/tests/data_class.dart.expect
+++ b/pkg/front_end/test/macros/application/data/tests/data_class.dart.expect
@@ -11,7 +11,7 @@
class Foo extends core::Object {
final field core::int bar;
final field core::String baz;
- const constructor •({required core::int bar, required core::String baz}) → self::Foo
+ const constructor /* from dart-macro+org-dartlang-test:///a/b/c/main.dart */ •({required core::int bar, required core::String baz}) → self::Foo
: self::Foo::bar = bar, self::Foo::baz = baz, super core::Object::•()
;
get /* from dart-macro+org-dartlang-test:///a/b/c/main.dart */ hashCode() → core::int {
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/typedef_from.dart.strong.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/typedef_from.dart.strong.expect
index 11c4428..a952db1 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/typedef_from.dart.strong.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/typedef_from.dart.strong.expect
@@ -5,7 +5,7 @@
import "org-dartlang-testcase:///typedef_from_lib.dart";
part typedef_from_part.dart;
-typedef B<S extends core::Object? = dynamic> = self::Class<S%, core::int>;
+typedef /* from org-dartlang-testcase:///typedef_from_part.dart */ B<S extends core::Object? = dynamic> = self::Class<S%, core::int>;
class Class<S extends core::Object? = dynamic, T extends core::Object? = dynamic> extends core::Object {
constructor •(self::Class::S% a, self::Class::T% b) → self::Class<self::Class::S%, self::Class::T%>
: super core::Object::•()
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/typedef_from.dart.strong.modular.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/typedef_from.dart.strong.modular.expect
index 11c4428..a952db1 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/typedef_from.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/typedef_from.dart.strong.modular.expect
@@ -5,7 +5,7 @@
import "org-dartlang-testcase:///typedef_from_lib.dart";
part typedef_from_part.dart;
-typedef B<S extends core::Object? = dynamic> = self::Class<S%, core::int>;
+typedef /* from org-dartlang-testcase:///typedef_from_part.dart */ B<S extends core::Object? = dynamic> = self::Class<S%, core::int>;
class Class<S extends core::Object? = dynamic, T extends core::Object? = dynamic> extends core::Object {
constructor •(self::Class::S% a, self::Class::T% b) → self::Class<self::Class::S%, self::Class::T%>
: super core::Object::•()
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/typedef_from.dart.strong.outline.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/typedef_from.dart.strong.outline.expect
index 2a2ef26..a5fbc45 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/typedef_from.dart.strong.outline.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/typedef_from.dart.strong.outline.expect
@@ -5,7 +5,7 @@
import "org-dartlang-testcase:///typedef_from_lib.dart";
part typedef_from_part.dart;
-typedef B<S extends core::Object? = dynamic> = self::Class<S%, core::int>;
+typedef /* from org-dartlang-testcase:///typedef_from_part.dart */ B<S extends core::Object? = dynamic> = self::Class<S%, core::int>;
class Class<S extends core::Object? = dynamic, T extends core::Object? = dynamic> extends core::Object {
constructor •(self::Class::S% a, self::Class::T% b) → self::Class<self::Class::S%, self::Class::T%>
;
diff --git a/pkg/front_end/testcases/constructor_tearoffs/lowering/typedef_from.dart.strong.transformed.expect b/pkg/front_end/testcases/constructor_tearoffs/lowering/typedef_from.dart.strong.transformed.expect
index 11c4428..a952db1 100644
--- a/pkg/front_end/testcases/constructor_tearoffs/lowering/typedef_from.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/constructor_tearoffs/lowering/typedef_from.dart.strong.transformed.expect
@@ -5,7 +5,7 @@
import "org-dartlang-testcase:///typedef_from_lib.dart";
part typedef_from_part.dart;
-typedef B<S extends core::Object? = dynamic> = self::Class<S%, core::int>;
+typedef /* from org-dartlang-testcase:///typedef_from_part.dart */ B<S extends core::Object? = dynamic> = self::Class<S%, core::int>;
class Class<S extends core::Object? = dynamic, T extends core::Object? = dynamic> extends core::Object {
constructor •(self::Class::S% a, self::Class::T% b) → self::Class<self::Class::S%, self::Class::T%>
: super core::Object::•()
diff --git a/pkg/front_end/testcases/dart2js/conditional_import.dart.strong.expect b/pkg/front_end/testcases/dart2js/conditional_import.dart.strong.expect
index b5b6eae..5ad530f 100644
--- a/pkg/front_end/testcases/dart2js/conditional_import.dart.strong.expect
+++ b/pkg/front_end/testcases/dart2js/conditional_import.dart.strong.expect
@@ -98,9 +98,9 @@
constants {
#C1 = "dart.library.io"
- #C2 = eval const core::bool::fromEnvironment(#C1)
+ #C2 = eval /* from org-dartlang-testcase:///conditional_import.dart */ const core::bool::fromEnvironment(#C1)
#C3 = "dart.library.html"
- #C4 = eval const core::bool::fromEnvironment(#C3)
+ #C4 = eval /* from org-dartlang-testcase:///conditional_import.dart */ const core::bool::fromEnvironment(#C3)
#C5 = "dart.library.foo"
- #C6 = eval const core::bool::fromEnvironment(#C5)
+ #C6 = eval /* from org-dartlang-testcase:///conditional_import.dart */ const core::bool::fromEnvironment(#C5)
}
diff --git a/pkg/front_end/testcases/dart2js/conditional_import.dart.strong.modular.expect b/pkg/front_end/testcases/dart2js/conditional_import.dart.strong.modular.expect
index b5b6eae..5ad530f 100644
--- a/pkg/front_end/testcases/dart2js/conditional_import.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/dart2js/conditional_import.dart.strong.modular.expect
@@ -98,9 +98,9 @@
constants {
#C1 = "dart.library.io"
- #C2 = eval const core::bool::fromEnvironment(#C1)
+ #C2 = eval /* from org-dartlang-testcase:///conditional_import.dart */ const core::bool::fromEnvironment(#C1)
#C3 = "dart.library.html"
- #C4 = eval const core::bool::fromEnvironment(#C3)
+ #C4 = eval /* from org-dartlang-testcase:///conditional_import.dart */ const core::bool::fromEnvironment(#C3)
#C5 = "dart.library.foo"
- #C6 = eval const core::bool::fromEnvironment(#C5)
+ #C6 = eval /* from org-dartlang-testcase:///conditional_import.dart */ const core::bool::fromEnvironment(#C5)
}
diff --git a/pkg/front_end/testcases/dart2js/conditional_import.dart.strong.transformed.expect b/pkg/front_end/testcases/dart2js/conditional_import.dart.strong.transformed.expect
index 00e1d6f..74b1803 100644
--- a/pkg/front_end/testcases/dart2js/conditional_import.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/dart2js/conditional_import.dart.strong.transformed.expect
@@ -98,11 +98,11 @@
constants {
#C1 = "dart.library.io"
- #C2 = eval const core::bool::fromEnvironment(#C1)
+ #C2 = eval /* from org-dartlang-testcase:///conditional_import.dart */ const core::bool::fromEnvironment(#C1)
#C3 = "dart.library.html"
- #C4 = eval const core::bool::fromEnvironment(#C3)
+ #C4 = eval /* from org-dartlang-testcase:///conditional_import.dart */ const core::bool::fromEnvironment(#C3)
#C5 = "dart.library.foo"
- #C6 = eval const core::bool::fromEnvironment(#C5)
+ #C6 = eval /* from org-dartlang-testcase:///conditional_import.dart */ const core::bool::fromEnvironment(#C5)
}
Extra constant evaluation status:
diff --git a/pkg/front_end/testcases/dart2js/conditional_import.dart.weak.expect b/pkg/front_end/testcases/dart2js/conditional_import.dart.weak.expect
index b5b6eae..5ad530f 100644
--- a/pkg/front_end/testcases/dart2js/conditional_import.dart.weak.expect
+++ b/pkg/front_end/testcases/dart2js/conditional_import.dart.weak.expect
@@ -98,9 +98,9 @@
constants {
#C1 = "dart.library.io"
- #C2 = eval const core::bool::fromEnvironment(#C1)
+ #C2 = eval /* from org-dartlang-testcase:///conditional_import.dart */ const core::bool::fromEnvironment(#C1)
#C3 = "dart.library.html"
- #C4 = eval const core::bool::fromEnvironment(#C3)
+ #C4 = eval /* from org-dartlang-testcase:///conditional_import.dart */ const core::bool::fromEnvironment(#C3)
#C5 = "dart.library.foo"
- #C6 = eval const core::bool::fromEnvironment(#C5)
+ #C6 = eval /* from org-dartlang-testcase:///conditional_import.dart */ const core::bool::fromEnvironment(#C5)
}
diff --git a/pkg/front_end/testcases/dart2js/conditional_import.dart.weak.transformed.expect b/pkg/front_end/testcases/dart2js/conditional_import.dart.weak.transformed.expect
index 00e1d6f..74b1803 100644
--- a/pkg/front_end/testcases/dart2js/conditional_import.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/dart2js/conditional_import.dart.weak.transformed.expect
@@ -98,11 +98,11 @@
constants {
#C1 = "dart.library.io"
- #C2 = eval const core::bool::fromEnvironment(#C1)
+ #C2 = eval /* from org-dartlang-testcase:///conditional_import.dart */ const core::bool::fromEnvironment(#C1)
#C3 = "dart.library.html"
- #C4 = eval const core::bool::fromEnvironment(#C3)
+ #C4 = eval /* from org-dartlang-testcase:///conditional_import.dart */ const core::bool::fromEnvironment(#C3)
#C5 = "dart.library.foo"
- #C6 = eval const core::bool::fromEnvironment(#C5)
+ #C6 = eval /* from org-dartlang-testcase:///conditional_import.dart */ const core::bool::fromEnvironment(#C5)
}
Extra constant evaluation status:
diff --git a/pkg/front_end/testcases/dart2js/enum_from_environment.dart.strong.expect b/pkg/front_end/testcases/dart2js/enum_from_environment.dart.strong.expect
index fd5e50f..889af53 100644
--- a/pkg/front_end/testcases/dart2js/enum_from_environment.dart.strong.expect
+++ b/pkg/front_end/testcases/dart2js/enum_from_environment.dart.strong.expect
@@ -43,18 +43,18 @@
constants {
#C1 = "a"
- #C2 = eval const core::int::fromEnvironment(#C1)
- #C3 = eval self::B{value:#C2}
+ #C2 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ const core::int::fromEnvironment(#C1)
+ #C3 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ self::B{value:#C2}
#C4 = 0.0
- #C5 = eval self::A{value:#C3, index:#C4, _name:#C1}
- #C6 = eval const <dynamic>[#C5]
+ #C5 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ self::A{value:#C3, index:#C4, _name:#C1}
+ #C6 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ const <dynamic>[#C5]
#C7 = "b"
- #C8 = eval const core::int::fromEnvironment(#C7)
- #C9 = eval self::B{value:#C8}
+ #C8 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ const core::int::fromEnvironment(#C7)
+ #C9 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ self::B{value:#C8}
#C10 = 1.0
- #C11 = eval self::A{value:#C9, index:#C10, _name:#C7}
- #C12 = eval const <dynamic>[#C11]
- #C13 = eval #C6 + #C12
+ #C11 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ self::A{value:#C9, index:#C10, _name:#C7}
+ #C12 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ const <dynamic>[#C11]
+ #C13 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ #C6 + #C12
}
diff --git a/pkg/front_end/testcases/dart2js/enum_from_environment.dart.strong.modular.expect b/pkg/front_end/testcases/dart2js/enum_from_environment.dart.strong.modular.expect
index fd5e50f..889af53 100644
--- a/pkg/front_end/testcases/dart2js/enum_from_environment.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/dart2js/enum_from_environment.dart.strong.modular.expect
@@ -43,18 +43,18 @@
constants {
#C1 = "a"
- #C2 = eval const core::int::fromEnvironment(#C1)
- #C3 = eval self::B{value:#C2}
+ #C2 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ const core::int::fromEnvironment(#C1)
+ #C3 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ self::B{value:#C2}
#C4 = 0.0
- #C5 = eval self::A{value:#C3, index:#C4, _name:#C1}
- #C6 = eval const <dynamic>[#C5]
+ #C5 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ self::A{value:#C3, index:#C4, _name:#C1}
+ #C6 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ const <dynamic>[#C5]
#C7 = "b"
- #C8 = eval const core::int::fromEnvironment(#C7)
- #C9 = eval self::B{value:#C8}
+ #C8 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ const core::int::fromEnvironment(#C7)
+ #C9 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ self::B{value:#C8}
#C10 = 1.0
- #C11 = eval self::A{value:#C9, index:#C10, _name:#C7}
- #C12 = eval const <dynamic>[#C11]
- #C13 = eval #C6 + #C12
+ #C11 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ self::A{value:#C9, index:#C10, _name:#C7}
+ #C12 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ const <dynamic>[#C11]
+ #C13 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ #C6 + #C12
}
diff --git a/pkg/front_end/testcases/dart2js/enum_from_environment.dart.strong.transformed.expect b/pkg/front_end/testcases/dart2js/enum_from_environment.dart.strong.transformed.expect
index a8716aa..2abac79 100644
--- a/pkg/front_end/testcases/dart2js/enum_from_environment.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/dart2js/enum_from_environment.dart.strong.transformed.expect
@@ -43,18 +43,18 @@
constants {
#C1 = "a"
- #C2 = eval const core::int::fromEnvironment(#C1)
- #C3 = eval self::B{value:#C2}
+ #C2 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ const core::int::fromEnvironment(#C1)
+ #C3 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ self::B{value:#C2}
#C4 = 0.0
- #C5 = eval self::A{value:#C3, index:#C4, _name:#C1}
- #C6 = eval const <dynamic>[#C5]
+ #C5 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ self::A{value:#C3, index:#C4, _name:#C1}
+ #C6 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ const <dynamic>[#C5]
#C7 = "b"
- #C8 = eval const core::int::fromEnvironment(#C7)
- #C9 = eval self::B{value:#C8}
+ #C8 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ const core::int::fromEnvironment(#C7)
+ #C9 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ self::B{value:#C8}
#C10 = 1.0
- #C11 = eval self::A{value:#C9, index:#C10, _name:#C7}
- #C12 = eval const <dynamic>[#C11]
- #C13 = eval #C6 + #C12
+ #C11 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ self::A{value:#C9, index:#C10, _name:#C7}
+ #C12 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ const <dynamic>[#C11]
+ #C13 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ #C6 + #C12
}
Extra constant evaluation status:
diff --git a/pkg/front_end/testcases/dart2js/enum_from_environment.dart.weak.expect b/pkg/front_end/testcases/dart2js/enum_from_environment.dart.weak.expect
index 4e78a88..cf42ddf 100644
--- a/pkg/front_end/testcases/dart2js/enum_from_environment.dart.weak.expect
+++ b/pkg/front_end/testcases/dart2js/enum_from_environment.dart.weak.expect
@@ -47,18 +47,18 @@
constants {
#C1 = "a"
- #C2 = eval const core::int::fromEnvironment(#C1)
- #C3 = eval self::B{value:#C2}
+ #C2 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ const core::int::fromEnvironment(#C1)
+ #C3 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ self::B{value:#C2}
#C4 = 0.0
- #C5 = eval self::A{value:#C3, index:#C4, _name:#C1}
- #C6 = eval const <dynamic>[#C5]
+ #C5 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ self::A{value:#C3, index:#C4, _name:#C1}
+ #C6 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ const <dynamic>[#C5]
#C7 = "b"
- #C8 = eval const core::int::fromEnvironment(#C7)
- #C9 = eval self::B{value:#C8}
+ #C8 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ const core::int::fromEnvironment(#C7)
+ #C9 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ self::B{value:#C8}
#C10 = 1.0
- #C11 = eval self::A{value:#C9, index:#C10, _name:#C7}
- #C12 = eval const <dynamic>[#C11]
- #C13 = eval #C6 + #C12
+ #C11 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ self::A{value:#C9, index:#C10, _name:#C7}
+ #C12 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ const <dynamic>[#C11]
+ #C13 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ #C6 + #C12
}
diff --git a/pkg/front_end/testcases/dart2js/enum_from_environment.dart.weak.transformed.expect b/pkg/front_end/testcases/dart2js/enum_from_environment.dart.weak.transformed.expect
index 09a832a..42f6d00 100644
--- a/pkg/front_end/testcases/dart2js/enum_from_environment.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/dart2js/enum_from_environment.dart.weak.transformed.expect
@@ -47,18 +47,18 @@
constants {
#C1 = "a"
- #C2 = eval const core::int::fromEnvironment(#C1)
- #C3 = eval self::B{value:#C2}
+ #C2 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ const core::int::fromEnvironment(#C1)
+ #C3 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ self::B{value:#C2}
#C4 = 0.0
- #C5 = eval self::A{value:#C3, index:#C4, _name:#C1}
- #C6 = eval const <dynamic>[#C5]
+ #C5 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ self::A{value:#C3, index:#C4, _name:#C1}
+ #C6 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ const <dynamic>[#C5]
#C7 = "b"
- #C8 = eval const core::int::fromEnvironment(#C7)
- #C9 = eval self::B{value:#C8}
+ #C8 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ const core::int::fromEnvironment(#C7)
+ #C9 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ self::B{value:#C8}
#C10 = 1.0
- #C11 = eval self::A{value:#C9, index:#C10, _name:#C7}
- #C12 = eval const <dynamic>[#C11]
- #C13 = eval #C6 + #C12
+ #C11 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ self::A{value:#C9, index:#C10, _name:#C7}
+ #C12 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ const <dynamic>[#C11]
+ #C13 = eval /* from org-dartlang-testcase:///enum_from_environment.dart */ #C6 + #C12
}
Extra constant evaluation status:
diff --git a/pkg/front_end/testcases/dart2js/issue51823.dart.strong.expect b/pkg/front_end/testcases/dart2js/issue51823.dart.strong.expect
index 1f21b64..e54b7cc 100644
--- a/pkg/front_end/testcases/dart2js/issue51823.dart.strong.expect
+++ b/pkg/front_end/testcases/dart2js/issue51823.dart.strong.expect
@@ -38,14 +38,14 @@
constants {
#C1 = "foo"
- #C2 = eval const core::bool::fromEnvironment(#C1)
+ #C2 = eval /* from org-dartlang-testcase:///issue51823.dart */ const core::bool::fromEnvironment(#C1)
#C3 = 0.0
#C4 = "a"
- #C5 = eval iss::E{index:#C3, _name:#C4}
+ #C5 = eval /* from org-dartlang-testcase:///issue51823_lib.dart */ iss::E{index:#C3, _name:#C4}
#C6 = 1.0
#C7 = "b"
- #C8 = eval iss::E{index:#C6, _name:#C7}
- #C9 = eval #C2 ?{iss::E} #C5 : #C8
+ #C8 = eval /* from org-dartlang-testcase:///issue51823_lib.dart */ iss::E{index:#C6, _name:#C7}
+ #C9 = eval /* from org-dartlang-testcase:///issue51823.dart */ #C2 ?{iss::E} #C5 : #C8
#C10 = iss::E {index:#C3, _name:#C4}
#C11 = iss::E {index:#C6, _name:#C7}
#C12 = <iss::E>[#C10, #C11]
diff --git a/pkg/front_end/testcases/dart2js/issue51823.dart.strong.modular.expect b/pkg/front_end/testcases/dart2js/issue51823.dart.strong.modular.expect
index 1f21b64..e54b7cc 100644
--- a/pkg/front_end/testcases/dart2js/issue51823.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/dart2js/issue51823.dart.strong.modular.expect
@@ -38,14 +38,14 @@
constants {
#C1 = "foo"
- #C2 = eval const core::bool::fromEnvironment(#C1)
+ #C2 = eval /* from org-dartlang-testcase:///issue51823.dart */ const core::bool::fromEnvironment(#C1)
#C3 = 0.0
#C4 = "a"
- #C5 = eval iss::E{index:#C3, _name:#C4}
+ #C5 = eval /* from org-dartlang-testcase:///issue51823_lib.dart */ iss::E{index:#C3, _name:#C4}
#C6 = 1.0
#C7 = "b"
- #C8 = eval iss::E{index:#C6, _name:#C7}
- #C9 = eval #C2 ?{iss::E} #C5 : #C8
+ #C8 = eval /* from org-dartlang-testcase:///issue51823_lib.dart */ iss::E{index:#C6, _name:#C7}
+ #C9 = eval /* from org-dartlang-testcase:///issue51823.dart */ #C2 ?{iss::E} #C5 : #C8
#C10 = iss::E {index:#C3, _name:#C4}
#C11 = iss::E {index:#C6, _name:#C7}
#C12 = <iss::E>[#C10, #C11]
diff --git a/pkg/front_end/testcases/dart2js/issue51823.dart.strong.transformed.expect b/pkg/front_end/testcases/dart2js/issue51823.dart.strong.transformed.expect
index c548240..c26dc0a 100644
--- a/pkg/front_end/testcases/dart2js/issue51823.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/dart2js/issue51823.dart.strong.transformed.expect
@@ -38,14 +38,14 @@
constants {
#C1 = "foo"
- #C2 = eval const core::bool::fromEnvironment(#C1)
+ #C2 = eval /* from org-dartlang-testcase:///issue51823.dart */ const core::bool::fromEnvironment(#C1)
#C3 = 0.0
#C4 = "a"
- #C5 = eval iss::E{index:#C3, _name:#C4}
+ #C5 = eval /* from org-dartlang-testcase:///issue51823_lib.dart */ iss::E{index:#C3, _name:#C4}
#C6 = 1.0
#C7 = "b"
- #C8 = eval iss::E{index:#C6, _name:#C7}
- #C9 = eval #C2 ?{iss::E} #C5 : #C8
+ #C8 = eval /* from org-dartlang-testcase:///issue51823_lib.dart */ iss::E{index:#C6, _name:#C7}
+ #C9 = eval /* from org-dartlang-testcase:///issue51823.dart */ #C2 ?{iss::E} #C5 : #C8
#C10 = iss::E {index:#C3, _name:#C4}
#C11 = iss::E {index:#C6, _name:#C7}
#C12 = <iss::E>[#C10, #C11]
diff --git a/pkg/front_end/testcases/dart2js/issue51823.dart.weak.expect b/pkg/front_end/testcases/dart2js/issue51823.dart.weak.expect
index bd9a852..df12090 100644
--- a/pkg/front_end/testcases/dart2js/issue51823.dart.weak.expect
+++ b/pkg/front_end/testcases/dart2js/issue51823.dart.weak.expect
@@ -42,14 +42,14 @@
constants {
#C1 = "foo"
- #C2 = eval const core::bool::fromEnvironment(#C1)
+ #C2 = eval /* from org-dartlang-testcase:///issue51823.dart */ const core::bool::fromEnvironment(#C1)
#C3 = 0.0
#C4 = "a"
- #C5 = eval iss::E{index:#C3, _name:#C4}
+ #C5 = eval /* from org-dartlang-testcase:///issue51823_lib.dart */ iss::E{index:#C3, _name:#C4}
#C6 = 1.0
#C7 = "b"
- #C8 = eval iss::E{index:#C6, _name:#C7}
- #C9 = eval #C2 ?{iss::E} #C5 : #C8
+ #C8 = eval /* from org-dartlang-testcase:///issue51823_lib.dart */ iss::E{index:#C6, _name:#C7}
+ #C9 = eval /* from org-dartlang-testcase:///issue51823.dart */ #C2 ?{iss::E} #C5 : #C8
#C10 = iss::E {index:#C3, _name:#C4}
#C11 = iss::E {index:#C6, _name:#C7}
#C12 = <iss::E*>[#C10, #C11]
diff --git a/pkg/front_end/testcases/dart2js/issue51823.dart.weak.transformed.expect b/pkg/front_end/testcases/dart2js/issue51823.dart.weak.transformed.expect
index 1d4fce1..41c6969 100644
--- a/pkg/front_end/testcases/dart2js/issue51823.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/dart2js/issue51823.dart.weak.transformed.expect
@@ -42,14 +42,14 @@
constants {
#C1 = "foo"
- #C2 = eval const core::bool::fromEnvironment(#C1)
+ #C2 = eval /* from org-dartlang-testcase:///issue51823.dart */ const core::bool::fromEnvironment(#C1)
#C3 = 0.0
#C4 = "a"
- #C5 = eval iss::E{index:#C3, _name:#C4}
+ #C5 = eval /* from org-dartlang-testcase:///issue51823_lib.dart */ iss::E{index:#C3, _name:#C4}
#C6 = 1.0
#C7 = "b"
- #C8 = eval iss::E{index:#C6, _name:#C7}
- #C9 = eval #C2 ?{iss::E} #C5 : #C8
+ #C8 = eval /* from org-dartlang-testcase:///issue51823_lib.dart */ iss::E{index:#C6, _name:#C7}
+ #C9 = eval /* from org-dartlang-testcase:///issue51823.dart */ #C2 ?{iss::E} #C5 : #C8
#C10 = iss::E {index:#C3, _name:#C4}
#C11 = iss::E {index:#C6, _name:#C7}
#C12 = <iss::E*>[#C10, #C11]
diff --git a/pkg/front_end/testcases/dart2js/tear_off_patch/main.dart.strong.expect b/pkg/front_end/testcases/dart2js/tear_off_patch/main.dart.strong.expect
index 274ff60..e5035cb 100644
--- a/pkg/front_end/testcases/dart2js/tear_off_patch/main.dart.strong.expect
+++ b/pkg/front_end/testcases/dart2js/tear_off_patch/main.dart.strong.expect
@@ -32,7 +32,7 @@
@/* from org-dartlang-testcase:///patch_lib.dart */ #C13
class Class<T extends core::Object? = dynamic> extends core::Object {
@#C13
- constructor •({core::bool defaultValue = #C14, required test::Class::T% value}) → test::Class<test::Class::T%>
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ •({core::bool defaultValue = #C14, required test::Class::T% value}) → test::Class<test::Class::T%>
: super core::Object::•() {
core::print("patch Class");
}
@@ -60,7 +60,7 @@
: super core::Object::•()
;
@#C13
- constructor patched({core::bool defaultValue = #C14, required test::ClassImpl::T% value}) → test::ClassImpl<test::ClassImpl::T%>
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ patched({core::bool defaultValue = #C14, required test::ClassImpl::T% value}) → test::ClassImpl<test::ClassImpl::T%>
: super core::Object::•() {
core::print("patch ClassImpl");
}
diff --git a/pkg/front_end/testcases/dart2js/tear_off_patch/main.dart.strong.modular.expect b/pkg/front_end/testcases/dart2js/tear_off_patch/main.dart.strong.modular.expect
index 274ff60..e5035cb 100644
--- a/pkg/front_end/testcases/dart2js/tear_off_patch/main.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/dart2js/tear_off_patch/main.dart.strong.modular.expect
@@ -32,7 +32,7 @@
@/* from org-dartlang-testcase:///patch_lib.dart */ #C13
class Class<T extends core::Object? = dynamic> extends core::Object {
@#C13
- constructor •({core::bool defaultValue = #C14, required test::Class::T% value}) → test::Class<test::Class::T%>
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ •({core::bool defaultValue = #C14, required test::Class::T% value}) → test::Class<test::Class::T%>
: super core::Object::•() {
core::print("patch Class");
}
@@ -60,7 +60,7 @@
: super core::Object::•()
;
@#C13
- constructor patched({core::bool defaultValue = #C14, required test::ClassImpl::T% value}) → test::ClassImpl<test::ClassImpl::T%>
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ patched({core::bool defaultValue = #C14, required test::ClassImpl::T% value}) → test::ClassImpl<test::ClassImpl::T%>
: super core::Object::•() {
core::print("patch ClassImpl");
}
diff --git a/pkg/front_end/testcases/dart2js/tear_off_patch/main.dart.strong.outline.expect b/pkg/front_end/testcases/dart2js/tear_off_patch/main.dart.strong.outline.expect
index 8ef59c7..8c06287 100644
--- a/pkg/front_end/testcases/dart2js/tear_off_patch/main.dart.strong.outline.expect
+++ b/pkg/front_end/testcases/dart2js/tear_off_patch/main.dart.strong.outline.expect
@@ -15,7 +15,7 @@
typedef Alias<T extends core::num> = self2::Class<T>;
typedef AliasImpl<T extends core::num> = self2::ClassImpl<T>;
-@_in::patch
+@/* from org-dartlang-testcase:///patch_lib.dart */ _in::patch
class Class<T extends core::Object? = dynamic> extends core::Object {
@_in::patch
external constructor •({core::bool defaultValue = true, required self2::Class::T% value}) → self2::Class<self2::Class::T%>;
@@ -36,7 +36,7 @@
static method _#redirect2#tearOff<T extends core::Object? = dynamic>({core::bool defaultValue, required self2::Class::_#redirect2#tearOff::T% value}) → self2::Class<self2::Class::_#redirect2#tearOff::T%>
return self2::Class::redirect2<self2::Class::_#redirect2#tearOff::T%>(defaultValue: defaultValue, value: value);
}
-@_in::patch
+@/* from org-dartlang-testcase:///patch_lib.dart */ _in::patch
class ClassImpl<T extends core::Object? = dynamic> extends core::Object implements self2::Class<self2::ClassImpl::T%> {
constructor •({core::bool defaultValue = true, required self2::ClassImpl::T% value}) → self2::ClassImpl<self2::ClassImpl::T%>
;
diff --git a/pkg/front_end/testcases/dart2js/tear_off_patch/main.dart.strong.transformed.expect b/pkg/front_end/testcases/dart2js/tear_off_patch/main.dart.strong.transformed.expect
index 274ff60..e5035cb 100644
--- a/pkg/front_end/testcases/dart2js/tear_off_patch/main.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/dart2js/tear_off_patch/main.dart.strong.transformed.expect
@@ -32,7 +32,7 @@
@/* from org-dartlang-testcase:///patch_lib.dart */ #C13
class Class<T extends core::Object? = dynamic> extends core::Object {
@#C13
- constructor •({core::bool defaultValue = #C14, required test::Class::T% value}) → test::Class<test::Class::T%>
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ •({core::bool defaultValue = #C14, required test::Class::T% value}) → test::Class<test::Class::T%>
: super core::Object::•() {
core::print("patch Class");
}
@@ -60,7 +60,7 @@
: super core::Object::•()
;
@#C13
- constructor patched({core::bool defaultValue = #C14, required test::ClassImpl::T% value}) → test::ClassImpl<test::ClassImpl::T%>
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ patched({core::bool defaultValue = #C14, required test::ClassImpl::T% value}) → test::ClassImpl<test::ClassImpl::T%>
: super core::Object::•() {
core::print("patch ClassImpl");
}
diff --git a/pkg/front_end/testcases/dart2js/tear_off_patch/main.dart.weak.expect b/pkg/front_end/testcases/dart2js/tear_off_patch/main.dart.weak.expect
index 274ff60..e5035cb 100644
--- a/pkg/front_end/testcases/dart2js/tear_off_patch/main.dart.weak.expect
+++ b/pkg/front_end/testcases/dart2js/tear_off_patch/main.dart.weak.expect
@@ -32,7 +32,7 @@
@/* from org-dartlang-testcase:///patch_lib.dart */ #C13
class Class<T extends core::Object? = dynamic> extends core::Object {
@#C13
- constructor •({core::bool defaultValue = #C14, required test::Class::T% value}) → test::Class<test::Class::T%>
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ •({core::bool defaultValue = #C14, required test::Class::T% value}) → test::Class<test::Class::T%>
: super core::Object::•() {
core::print("patch Class");
}
@@ -60,7 +60,7 @@
: super core::Object::•()
;
@#C13
- constructor patched({core::bool defaultValue = #C14, required test::ClassImpl::T% value}) → test::ClassImpl<test::ClassImpl::T%>
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ patched({core::bool defaultValue = #C14, required test::ClassImpl::T% value}) → test::ClassImpl<test::ClassImpl::T%>
: super core::Object::•() {
core::print("patch ClassImpl");
}
diff --git a/pkg/front_end/testcases/dart2js/tear_off_patch/main.dart.weak.transformed.expect b/pkg/front_end/testcases/dart2js/tear_off_patch/main.dart.weak.transformed.expect
index 274ff60..e5035cb 100644
--- a/pkg/front_end/testcases/dart2js/tear_off_patch/main.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/dart2js/tear_off_patch/main.dart.weak.transformed.expect
@@ -32,7 +32,7 @@
@/* from org-dartlang-testcase:///patch_lib.dart */ #C13
class Class<T extends core::Object? = dynamic> extends core::Object {
@#C13
- constructor •({core::bool defaultValue = #C14, required test::Class::T% value}) → test::Class<test::Class::T%>
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ •({core::bool defaultValue = #C14, required test::Class::T% value}) → test::Class<test::Class::T%>
: super core::Object::•() {
core::print("patch Class");
}
@@ -60,7 +60,7 @@
: super core::Object::•()
;
@#C13
- constructor patched({core::bool defaultValue = #C14, required test::ClassImpl::T% value}) → test::ClassImpl<test::ClassImpl::T%>
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ patched({core::bool defaultValue = #C14, required test::ClassImpl::T% value}) → test::ClassImpl<test::ClassImpl::T%>
: super core::Object::•() {
core::print("patch ClassImpl");
}
diff --git a/pkg/front_end/testcases/dartdevc/factory_patch/main.dart.strong.expect b/pkg/front_end/testcases/dartdevc/factory_patch/main.dart.strong.expect
index 742c6c5..1eaf61d 100644
--- a/pkg/front_end/testcases/dartdevc/factory_patch/main.dart.strong.expect
+++ b/pkg/front_end/testcases/dartdevc/factory_patch/main.dart.strong.expect
@@ -18,7 +18,7 @@
@/* from org-dartlang-testcase:///patch_lib.dart */ #C1
class Class extends core::Object {
final field core::bool defaultValue /* from org-dartlang-testcase:///patch_lib.dart */;
- const constructor _internal({core::bool defaultValue = #C2}) → test::Class
+ const constructor /* from org-dartlang-testcase:///patch_lib.dart */ _internal({core::bool defaultValue = #C2}) → test::Class
: test::Class::defaultValue = defaultValue, super core::Object::•()
;
@#C1
diff --git a/pkg/front_end/testcases/dartdevc/factory_patch/main.dart.strong.modular.expect b/pkg/front_end/testcases/dartdevc/factory_patch/main.dart.strong.modular.expect
index 742c6c5..1eaf61d 100644
--- a/pkg/front_end/testcases/dartdevc/factory_patch/main.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/dartdevc/factory_patch/main.dart.strong.modular.expect
@@ -18,7 +18,7 @@
@/* from org-dartlang-testcase:///patch_lib.dart */ #C1
class Class extends core::Object {
final field core::bool defaultValue /* from org-dartlang-testcase:///patch_lib.dart */;
- const constructor _internal({core::bool defaultValue = #C2}) → test::Class
+ const constructor /* from org-dartlang-testcase:///patch_lib.dart */ _internal({core::bool defaultValue = #C2}) → test::Class
: test::Class::defaultValue = defaultValue, super core::Object::•()
;
@#C1
diff --git a/pkg/front_end/testcases/dartdevc/factory_patch/main.dart.strong.outline.expect b/pkg/front_end/testcases/dartdevc/factory_patch/main.dart.strong.outline.expect
index 7bfb695..20b5b94 100644
--- a/pkg/front_end/testcases/dartdevc/factory_patch/main.dart.strong.outline.expect
+++ b/pkg/front_end/testcases/dartdevc/factory_patch/main.dart.strong.outline.expect
@@ -13,10 +13,10 @@
import "dart:_internal";
-@_in::patch
+@/* from org-dartlang-testcase:///patch_lib.dart */ _in::patch
class Class extends core::Object {
final field core::bool defaultValue /* from org-dartlang-testcase:///patch_lib.dart */;
- const constructor _internal({core::bool defaultValue = false}) → self2::Class
+ const constructor /* from org-dartlang-testcase:///patch_lib.dart */ _internal({core::bool defaultValue = false}) → self2::Class
: self2::Class::defaultValue = defaultValue, super core::Object::•()
;
@_in::patch
diff --git a/pkg/front_end/testcases/dartdevc/factory_patch/main.dart.strong.transformed.expect b/pkg/front_end/testcases/dartdevc/factory_patch/main.dart.strong.transformed.expect
index 742c6c5..1eaf61d 100644
--- a/pkg/front_end/testcases/dartdevc/factory_patch/main.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/dartdevc/factory_patch/main.dart.strong.transformed.expect
@@ -18,7 +18,7 @@
@/* from org-dartlang-testcase:///patch_lib.dart */ #C1
class Class extends core::Object {
final field core::bool defaultValue /* from org-dartlang-testcase:///patch_lib.dart */;
- const constructor _internal({core::bool defaultValue = #C2}) → test::Class
+ const constructor /* from org-dartlang-testcase:///patch_lib.dart */ _internal({core::bool defaultValue = #C2}) → test::Class
: test::Class::defaultValue = defaultValue, super core::Object::•()
;
@#C1
diff --git a/pkg/front_end/testcases/general/constructor_patch/main.dart.strong.expect b/pkg/front_end/testcases/general/constructor_patch/main.dart.strong.expect
index bbbf1ec..082ffcc 100644
--- a/pkg/front_end/testcases/general/constructor_patch/main.dart.strong.expect
+++ b/pkg/front_end/testcases/general/constructor_patch/main.dart.strong.expect
@@ -38,25 +38,25 @@
@/* from org-dartlang-testcase:///patch_lib.dart */ #C3
class Class extends core::Object /*hasConstConstructor*/ {
final field core::bool defaultValue /* from org-dartlang-testcase:///patch_lib.dart */;
- constructor _privateInjected() → test::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ _privateInjected() → test::Class
: test::Class::defaultValue = false, super core::Object::•()
;
- constructor redirect() → test::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ redirect() → test::Class
: this test::Class::_private()
;
- constructor redirectInjected() → test::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ redirectInjected() → test::Class
: this test::Class::_privateInjected()
;
@#C3
- constructor generative({core::bool defaultValue = #C1}) → test::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ generative({core::bool defaultValue = #C1}) → test::Class
: test::Class::defaultValue = defaultValue, super core::Object::•()
;
@#C3
- const constructor constGenerative({core::bool defaultValue = #C1}) → test::Class
+ const constructor /* from org-dartlang-testcase:///patch_lib.dart */ constGenerative({core::bool defaultValue = #C1}) → test::Class
: test::Class::defaultValue = defaultValue, super core::Object::•()
;
@#C3
- constructor _private() → test::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ _private() → test::Class
: test::Class::defaultValue = true, super core::Object::•()
;
}
@@ -65,7 +65,7 @@
final field core::int injectedField /* from org-dartlang-testcase:///patch_lib.dart */;
field core::int field;
@#C3
- constructor •(core::int field) → test::Class2
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ •(core::int field) → test::Class2
: test::Class2::field = field, test::Class2::injectedField = field, super core::Object::•()
;
}
diff --git a/pkg/front_end/testcases/general/constructor_patch/main.dart.strong.modular.expect b/pkg/front_end/testcases/general/constructor_patch/main.dart.strong.modular.expect
index bbbf1ec..082ffcc 100644
--- a/pkg/front_end/testcases/general/constructor_patch/main.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/general/constructor_patch/main.dart.strong.modular.expect
@@ -38,25 +38,25 @@
@/* from org-dartlang-testcase:///patch_lib.dart */ #C3
class Class extends core::Object /*hasConstConstructor*/ {
final field core::bool defaultValue /* from org-dartlang-testcase:///patch_lib.dart */;
- constructor _privateInjected() → test::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ _privateInjected() → test::Class
: test::Class::defaultValue = false, super core::Object::•()
;
- constructor redirect() → test::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ redirect() → test::Class
: this test::Class::_private()
;
- constructor redirectInjected() → test::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ redirectInjected() → test::Class
: this test::Class::_privateInjected()
;
@#C3
- constructor generative({core::bool defaultValue = #C1}) → test::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ generative({core::bool defaultValue = #C1}) → test::Class
: test::Class::defaultValue = defaultValue, super core::Object::•()
;
@#C3
- const constructor constGenerative({core::bool defaultValue = #C1}) → test::Class
+ const constructor /* from org-dartlang-testcase:///patch_lib.dart */ constGenerative({core::bool defaultValue = #C1}) → test::Class
: test::Class::defaultValue = defaultValue, super core::Object::•()
;
@#C3
- constructor _private() → test::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ _private() → test::Class
: test::Class::defaultValue = true, super core::Object::•()
;
}
@@ -65,7 +65,7 @@
final field core::int injectedField /* from org-dartlang-testcase:///patch_lib.dart */;
field core::int field;
@#C3
- constructor •(core::int field) → test::Class2
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ •(core::int field) → test::Class2
: test::Class2::field = field, test::Class2::injectedField = field, super core::Object::•()
;
}
diff --git a/pkg/front_end/testcases/general/constructor_patch/main.dart.strong.outline.expect b/pkg/front_end/testcases/general/constructor_patch/main.dart.strong.outline.expect
index a591faf..1a2158e 100644
--- a/pkg/front_end/testcases/general/constructor_patch/main.dart.strong.outline.expect
+++ b/pkg/front_end/testcases/general/constructor_patch/main.dart.strong.outline.expect
@@ -15,25 +15,25 @@
import "dart:_internal";
-@_in::patch
+@/* from org-dartlang-testcase:///patch_lib.dart */ _in::patch
class Class extends core::Object /*hasConstConstructor*/ {
final field core::bool defaultValue /* from org-dartlang-testcase:///patch_lib.dart */;
- constructor _privateInjected() → self2::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ _privateInjected() → self2::Class
;
- constructor redirect() → self2::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ redirect() → self2::Class
;
- constructor redirectInjected() → self2::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ redirectInjected() → self2::Class
;
@_in::patch
external constructor generative({core::bool defaultValue = true}) → self2::Class;
@_in::patch
- const constructor constGenerative({core::bool defaultValue = true}) → self2::Class
+ const constructor /* from org-dartlang-testcase:///patch_lib.dart */ constGenerative({core::bool defaultValue = true}) → self2::Class
: self2::Class::defaultValue = defaultValue, super core::Object::•()
;
@_in::patch
external constructor _private() → self2::Class;
}
-@_in::patch
+@/* from org-dartlang-testcase:///patch_lib.dart */ _in::patch
class Class2 extends core::Object {
final field core::int injectedField /* from org-dartlang-testcase:///patch_lib.dart */;
field core::int field;
diff --git a/pkg/front_end/testcases/general/constructor_patch/main.dart.strong.transformed.expect b/pkg/front_end/testcases/general/constructor_patch/main.dart.strong.transformed.expect
index bbbf1ec..082ffcc 100644
--- a/pkg/front_end/testcases/general/constructor_patch/main.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/constructor_patch/main.dart.strong.transformed.expect
@@ -38,25 +38,25 @@
@/* from org-dartlang-testcase:///patch_lib.dart */ #C3
class Class extends core::Object /*hasConstConstructor*/ {
final field core::bool defaultValue /* from org-dartlang-testcase:///patch_lib.dart */;
- constructor _privateInjected() → test::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ _privateInjected() → test::Class
: test::Class::defaultValue = false, super core::Object::•()
;
- constructor redirect() → test::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ redirect() → test::Class
: this test::Class::_private()
;
- constructor redirectInjected() → test::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ redirectInjected() → test::Class
: this test::Class::_privateInjected()
;
@#C3
- constructor generative({core::bool defaultValue = #C1}) → test::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ generative({core::bool defaultValue = #C1}) → test::Class
: test::Class::defaultValue = defaultValue, super core::Object::•()
;
@#C3
- const constructor constGenerative({core::bool defaultValue = #C1}) → test::Class
+ const constructor /* from org-dartlang-testcase:///patch_lib.dart */ constGenerative({core::bool defaultValue = #C1}) → test::Class
: test::Class::defaultValue = defaultValue, super core::Object::•()
;
@#C3
- constructor _private() → test::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ _private() → test::Class
: test::Class::defaultValue = true, super core::Object::•()
;
}
@@ -65,7 +65,7 @@
final field core::int injectedField /* from org-dartlang-testcase:///patch_lib.dart */;
field core::int field;
@#C3
- constructor •(core::int field) → test::Class2
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ •(core::int field) → test::Class2
: test::Class2::field = field, test::Class2::injectedField = field, super core::Object::•()
;
}
diff --git a/pkg/front_end/testcases/general/factory_patch/main.dart.strong.expect b/pkg/front_end/testcases/general/factory_patch/main.dart.strong.expect
index 55092a2..e2d7f06 100644
--- a/pkg/front_end/testcases/general/factory_patch/main.dart.strong.expect
+++ b/pkg/front_end/testcases/general/factory_patch/main.dart.strong.expect
@@ -26,7 +26,7 @@
@/* from org-dartlang-testcase:///patch_lib.dart */ #C1
class Class extends core::Object {
final field core::bool defaultValue /* from org-dartlang-testcase:///patch_lib.dart */;
- const constructor _internal({core::bool defaultValue = #C2}) → test::Class
+ const constructor /* from org-dartlang-testcase:///patch_lib.dart */ _internal({core::bool defaultValue = #C2}) → test::Class
: test::Class::defaultValue = defaultValue, super core::Object::•()
;
@#C1
diff --git a/pkg/front_end/testcases/general/factory_patch/main.dart.strong.modular.expect b/pkg/front_end/testcases/general/factory_patch/main.dart.strong.modular.expect
index 55092a2..e2d7f06 100644
--- a/pkg/front_end/testcases/general/factory_patch/main.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/general/factory_patch/main.dart.strong.modular.expect
@@ -26,7 +26,7 @@
@/* from org-dartlang-testcase:///patch_lib.dart */ #C1
class Class extends core::Object {
final field core::bool defaultValue /* from org-dartlang-testcase:///patch_lib.dart */;
- const constructor _internal({core::bool defaultValue = #C2}) → test::Class
+ const constructor /* from org-dartlang-testcase:///patch_lib.dart */ _internal({core::bool defaultValue = #C2}) → test::Class
: test::Class::defaultValue = defaultValue, super core::Object::•()
;
@#C1
diff --git a/pkg/front_end/testcases/general/factory_patch/main.dart.strong.outline.expect b/pkg/front_end/testcases/general/factory_patch/main.dart.strong.outline.expect
index 2d33898..0746810 100644
--- a/pkg/front_end/testcases/general/factory_patch/main.dart.strong.outline.expect
+++ b/pkg/front_end/testcases/general/factory_patch/main.dart.strong.outline.expect
@@ -13,10 +13,10 @@
import "dart:_internal";
-@_in::patch
+@/* from org-dartlang-testcase:///patch_lib.dart */ _in::patch
class Class extends core::Object {
final field core::bool defaultValue /* from org-dartlang-testcase:///patch_lib.dart */;
- const constructor _internal({core::bool defaultValue = false}) → self2::Class
+ const constructor /* from org-dartlang-testcase:///patch_lib.dart */ _internal({core::bool defaultValue = false}) → self2::Class
: self2::Class::defaultValue = defaultValue, super core::Object::•()
;
@_in::patch
diff --git a/pkg/front_end/testcases/general/factory_patch/main.dart.strong.transformed.expect b/pkg/front_end/testcases/general/factory_patch/main.dart.strong.transformed.expect
index 55092a2..e2d7f06 100644
--- a/pkg/front_end/testcases/general/factory_patch/main.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/factory_patch/main.dart.strong.transformed.expect
@@ -26,7 +26,7 @@
@/* from org-dartlang-testcase:///patch_lib.dart */ #C1
class Class extends core::Object {
final field core::bool defaultValue /* from org-dartlang-testcase:///patch_lib.dart */;
- const constructor _internal({core::bool defaultValue = #C2}) → test::Class
+ const constructor /* from org-dartlang-testcase:///patch_lib.dart */ _internal({core::bool defaultValue = #C2}) → test::Class
: test::Class::defaultValue = defaultValue, super core::Object::•()
;
@#C1
diff --git a/pkg/front_end/testcases/general/inject_private_patch/main.dart.strong.outline.expect b/pkg/front_end/testcases/general/inject_private_patch/main.dart.strong.outline.expect
index 9e8a3ec..167d2d2 100644
--- a/pkg/front_end/testcases/general/inject_private_patch/main.dart.strong.outline.expect
+++ b/pkg/front_end/testcases/general/inject_private_patch/main.dart.strong.outline.expect
@@ -49,8 +49,8 @@
import "dart:_internal";
import "dart:_internal";
-@_in::patch
-@_in::patch
+@/* from org-dartlang-testcase:///patch_lib1.dart */ _in::patch
+@/* from org-dartlang-testcase:///patch_lib2.dart */ _in::patch
class Class extends core::Object {
synthetic constructor •() → self2::Class
;
diff --git a/pkg/front_end/testcases/general/inject_public/main.dart.strong.outline.expect b/pkg/front_end/testcases/general/inject_public/main.dart.strong.outline.expect
index f5b52c8..8154ebc 100644
--- a/pkg/front_end/testcases/general/inject_public/main.dart.strong.outline.expect
+++ b/pkg/front_end/testcases/general/inject_public/main.dart.strong.outline.expect
@@ -32,7 +32,7 @@
synthetic constructor •() → self2::InjectedClass
;
}
-@_in::patch
+@/* from org-dartlang-testcase:///patch_lib.dart */ _in::patch
class Class extends core::Object {
synthetic constructor •() → self2::Class
;
diff --git a/pkg/front_end/testcases/general/issue45101/main.dart.strong.outline.expect b/pkg/front_end/testcases/general/issue45101/main.dart.strong.outline.expect
index cce9288..8c0e628 100644
--- a/pkg/front_end/testcases/general/issue45101/main.dart.strong.outline.expect
+++ b/pkg/front_end/testcases/general/issue45101/main.dart.strong.outline.expect
@@ -19,8 +19,8 @@
: self2::_ArraySize::foo = foo, super core::Object::•()
;
}
-@_in::patch
-@const core::pragma::_("vm:entry-point")
+@/* from org-dartlang-testcase:///patch_lib.dart */ _in::patch
+@/* from org-dartlang-testcase:///patch_lib.dart */ const core::pragma::_("vm:entry-point")
class Array<T extends core::Object? = dynamic> extends core::Object {
@_in::patch
static factory /* from org-dartlang-testcase:///patch_lib.dart */ •<T extends core::Object? = dynamic>(core::int foo) → self2::Array<self2::Array::•::T%> /* redirection-target: self2::_ArraySize::•<self2::Array::•::T%>*/
diff --git a/pkg/front_end/testcases/general/mixin_from_patch/main.dart.strong.expect b/pkg/front_end/testcases/general/mixin_from_patch/main.dart.strong.expect
index f808d0d..d32bbcb 100644
--- a/pkg/front_end/testcases/general/mixin_from_patch/main.dart.strong.expect
+++ b/pkg/front_end/testcases/general/mixin_from_patch/main.dart.strong.expect
@@ -20,11 +20,11 @@
@/* from org-dartlang-testcase:///patch_lib.dart */ #C1
class Class extends core::Object {
- constructor _internal({core::bool value = #C2}) → test::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ _internal({core::bool value = #C2}) → test::Class
: super core::Object::•()
;
@#C1
- constructor patched() → test::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ patched() → test::Class
: this test::Class::_internal()
;
constructor unpatched() → test::Class
@@ -46,11 +46,11 @@
}
@/* from org-dartlang-testcase:///patch_lib.dart */ #C1
class SubClass extends test::_SubClass&Class&Mixin {
- constructor _internal() → test::SubClass
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ _internal() → test::SubClass
: super test::_SubClass&Class&Mixin::_internal(value: true)
;
@#C1
- constructor patched() → test::SubClass
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ patched() → test::SubClass
: this test::SubClass::_internal()
;
constructor unpatched() → test::SubClass
diff --git a/pkg/front_end/testcases/general/mixin_from_patch/main.dart.strong.modular.expect b/pkg/front_end/testcases/general/mixin_from_patch/main.dart.strong.modular.expect
index f808d0d..d32bbcb 100644
--- a/pkg/front_end/testcases/general/mixin_from_patch/main.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/general/mixin_from_patch/main.dart.strong.modular.expect
@@ -20,11 +20,11 @@
@/* from org-dartlang-testcase:///patch_lib.dart */ #C1
class Class extends core::Object {
- constructor _internal({core::bool value = #C2}) → test::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ _internal({core::bool value = #C2}) → test::Class
: super core::Object::•()
;
@#C1
- constructor patched() → test::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ patched() → test::Class
: this test::Class::_internal()
;
constructor unpatched() → test::Class
@@ -46,11 +46,11 @@
}
@/* from org-dartlang-testcase:///patch_lib.dart */ #C1
class SubClass extends test::_SubClass&Class&Mixin {
- constructor _internal() → test::SubClass
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ _internal() → test::SubClass
: super test::_SubClass&Class&Mixin::_internal(value: true)
;
@#C1
- constructor patched() → test::SubClass
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ patched() → test::SubClass
: this test::SubClass::_internal()
;
constructor unpatched() → test::SubClass
diff --git a/pkg/front_end/testcases/general/mixin_from_patch/main.dart.strong.outline.expect b/pkg/front_end/testcases/general/mixin_from_patch/main.dart.strong.outline.expect
index 1bfb45f..802ea58 100644
--- a/pkg/front_end/testcases/general/mixin_from_patch/main.dart.strong.outline.expect
+++ b/pkg/front_end/testcases/general/mixin_from_patch/main.dart.strong.outline.expect
@@ -13,9 +13,9 @@
import "dart:_internal";
-@_in::patch
+@/* from org-dartlang-testcase:///patch_lib.dart */ _in::patch
class Class extends core::Object {
- constructor _internal({core::bool value = false}) → self2::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ _internal({core::bool value = false}) → self2::Class
;
@_in::patch
external constructor patched() → self2::Class;
@@ -35,9 +35,9 @@
: super self2::Class::_internal(value: value)
;
}
-@_in::patch
+@/* from org-dartlang-testcase:///patch_lib.dart */ _in::patch
class SubClass extends self2::_SubClass&Class&Mixin {
- constructor _internal() → self2::SubClass
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ _internal() → self2::SubClass
;
@_in::patch
external constructor patched() → self2::SubClass;
diff --git a/pkg/front_end/testcases/general/mixin_from_patch/main.dart.strong.transformed.expect b/pkg/front_end/testcases/general/mixin_from_patch/main.dart.strong.transformed.expect
index da2bc41..0643475 100644
--- a/pkg/front_end/testcases/general/mixin_from_patch/main.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/mixin_from_patch/main.dart.strong.transformed.expect
@@ -20,11 +20,11 @@
@/* from org-dartlang-testcase:///patch_lib.dart */ #C1
class Class extends core::Object {
- constructor _internal({core::bool value = #C2}) → test::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ _internal({core::bool value = #C2}) → test::Class
: super core::Object::•()
;
@#C1
- constructor patched() → test::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ patched() → test::Class
: this test::Class::_internal()
;
constructor unpatched() → test::Class
@@ -46,11 +46,11 @@
}
@/* from org-dartlang-testcase:///patch_lib.dart */ #C1
class SubClass extends test::_SubClass&Class&Mixin {
- constructor _internal() → test::SubClass
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ _internal() → test::SubClass
: super test::_SubClass&Class&Mixin::_internal(value: true)
;
@#C1
- constructor patched() → test::SubClass
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ patched() → test::SubClass
: this test::SubClass::_internal()
;
constructor unpatched() → test::SubClass
diff --git a/pkg/front_end/testcases/general/multiple_class_patches/main.dart.strong.outline.expect b/pkg/front_end/testcases/general/multiple_class_patches/main.dart.strong.outline.expect
index 8c172ea..0056d3b 100644
--- a/pkg/front_end/testcases/general/multiple_class_patches/main.dart.strong.outline.expect
+++ b/pkg/front_end/testcases/general/multiple_class_patches/main.dart.strong.outline.expect
@@ -16,8 +16,8 @@
import "dart:_internal";
import "dart:_internal";
-@_in::patch
-@_in::patch
+@/* from org-dartlang-testcase:///patch_lib1.dart */ _in::patch
+@/* from org-dartlang-testcase:///patch_lib2.dart */ _in::patch
class Class extends core::Object {
synthetic constructor •() → self2::Class
;
@@ -25,7 +25,7 @@
external method method1() → core::int;
@_in::patch
external method method2() → core::int;
- @_in::patch
+ @/* from org-dartlang-testcase:///patch_lib1.dart */ _in::patch
@_in::patch
external method method3() → core::int;
}
diff --git a/pkg/front_end/testcases/general/nested_lib_spec/main.dart.strong.outline.expect b/pkg/front_end/testcases/general/nested_lib_spec/main.dart.strong.outline.expect
index d70d895..cbea0f1 100644
--- a/pkg/front_end/testcases/general/nested_lib_spec/main.dart.strong.outline.expect
+++ b/pkg/front_end/testcases/general/nested_lib_spec/main.dart.strong.outline.expect
@@ -19,7 +19,7 @@
import "dart:_internal";
-@_in::patch
+@/* from org-dartlang-testcase:///patch_lib.dart */ _in::patch
class Class extends core::Object {
synthetic constructor •() → self2::Class
;
@@ -32,7 +32,7 @@
import "dart:_internal";
-@_in::patch
+@/* from org-dartlang-testcase:///extra_patch_lib.dart */ _in::patch
class Extra extends core::Object {
synthetic constructor •() → self3::Extra
;
diff --git a/pkg/front_end/testcases/general/patch_annotations/main.dart.strong.expect b/pkg/front_end/testcases/general/patch_annotations/main.dart.strong.expect
index 41ec652..87f5934 100644
--- a/pkg/front_end/testcases/general/patch_annotations/main.dart.strong.expect
+++ b/pkg/front_end/testcases/general/patch_annotations/main.dart.strong.expect
@@ -21,7 +21,7 @@
@#C6
@#C16
@/* from org-dartlang-testcase:///origin_lib.dart */ #C18
- external constructor •() → self2::Class<self2::Class::T%>;
+ external constructor /* from org-dartlang-testcase:///patch_lib.dart */ •() → self2::Class<self2::Class::T%>;
@#C6
@#C20
@/* from org-dartlang-testcase:///origin_lib.dart */ #C22
diff --git a/pkg/front_end/testcases/general/patch_annotations/main.dart.strong.modular.expect b/pkg/front_end/testcases/general/patch_annotations/main.dart.strong.modular.expect
index 41ec652..87f5934 100644
--- a/pkg/front_end/testcases/general/patch_annotations/main.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/general/patch_annotations/main.dart.strong.modular.expect
@@ -21,7 +21,7 @@
@#C6
@#C16
@/* from org-dartlang-testcase:///origin_lib.dart */ #C18
- external constructor •() → self2::Class<self2::Class::T%>;
+ external constructor /* from org-dartlang-testcase:///patch_lib.dart */ •() → self2::Class<self2::Class::T%>;
@#C6
@#C20
@/* from org-dartlang-testcase:///origin_lib.dart */ #C22
diff --git a/pkg/front_end/testcases/general/patch_annotations/main.dart.strong.outline.expect b/pkg/front_end/testcases/general/patch_annotations/main.dart.strong.outline.expect
index 72884c4..f38c3d3 100644
--- a/pkg/front_end/testcases/general/patch_annotations/main.dart.strong.outline.expect
+++ b/pkg/front_end/testcases/general/patch_annotations/main.dart.strong.outline.expect
@@ -6,7 +6,7 @@
static method main() → dynamic
;
-@const dart.core::pragma::_("patch-library")
+@/* from org-dartlang-testcase:///patch_lib.dart */ const dart.core::pragma::_("patch-library")
@dart.core::pragma::_("origin-library")
library;
import self as self2;
@@ -15,17 +15,17 @@
import "dart:_internal";
-@_in::patch
-@const core::pragma::_("patch-class")
+@/* from org-dartlang-testcase:///patch_lib.dart */ _in::patch
+@/* from org-dartlang-testcase:///patch_lib.dart */ const core::pragma::_("patch-class")
@core::pragma::_("origin-class")
class Class<@core::pragma::_("patch-class-type-variable") @core::pragma::_("origin-class-type-variable") T extends core::Object? = dynamic> extends core::Object {
@_in::patch
@core::pragma::_("patch-constructor")
- @const core::pragma::_("origin-constructor")
+ @/* from org-dartlang-testcase:///origin_lib.dart */ const core::pragma::_("origin-constructor")
external constructor •() → self2::Class<self2::Class::T%>;
@_in::patch
@core::pragma::_("patch-procedure")
- @const core::pragma::_("origin-procedure")
+ @/* from org-dartlang-testcase:///origin_lib.dart */ const core::pragma::_("origin-procedure")
external method method<@core::pragma::_("origin-method-type-variable") S extends core::Object? = dynamic>() → void;
}
diff --git a/pkg/front_end/testcases/general/patch_annotations/main.dart.strong.transformed.expect b/pkg/front_end/testcases/general/patch_annotations/main.dart.strong.transformed.expect
index 41ec652..87f5934 100644
--- a/pkg/front_end/testcases/general/patch_annotations/main.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/patch_annotations/main.dart.strong.transformed.expect
@@ -21,7 +21,7 @@
@#C6
@#C16
@/* from org-dartlang-testcase:///origin_lib.dart */ #C18
- external constructor •() → self2::Class<self2::Class::T%>;
+ external constructor /* from org-dartlang-testcase:///patch_lib.dart */ •() → self2::Class<self2::Class::T%>;
@#C6
@#C20
@/* from org-dartlang-testcase:///origin_lib.dart */ #C22
diff --git a/pkg/front_end/testcases/general/patch_conflict/main.dart.strong.expect b/pkg/front_end/testcases/general/patch_conflict/main.dart.strong.expect
index 93c0fff..ca13ee5 100644
--- a/pkg/front_end/testcases/general/patch_conflict/main.dart.strong.expect
+++ b/pkg/front_end/testcases/general/patch_conflict/main.dart.strong.expect
@@ -99,7 +99,7 @@
@/* from org-dartlang-testcase:///patch_lib.dart */ #C1
class Class extends core::Object {
@#C1
- constructor missingOriginConstructor() → self2::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ missingOriginConstructor() → self2::Class
: super core::Object::•()
;
constructor •() → self2::Class
diff --git a/pkg/front_end/testcases/general/patch_conflict/main.dart.strong.modular.expect b/pkg/front_end/testcases/general/patch_conflict/main.dart.strong.modular.expect
index 93c0fff..ca13ee5 100644
--- a/pkg/front_end/testcases/general/patch_conflict/main.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/general/patch_conflict/main.dart.strong.modular.expect
@@ -99,7 +99,7 @@
@/* from org-dartlang-testcase:///patch_lib.dart */ #C1
class Class extends core::Object {
@#C1
- constructor missingOriginConstructor() → self2::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ missingOriginConstructor() → self2::Class
: super core::Object::•()
;
constructor •() → self2::Class
diff --git a/pkg/front_end/testcases/general/patch_conflict/main.dart.strong.outline.expect b/pkg/front_end/testcases/general/patch_conflict/main.dart.strong.outline.expect
index 60af488..d0b30cb 100644
--- a/pkg/front_end/testcases/general/patch_conflict/main.dart.strong.outline.expect
+++ b/pkg/front_end/testcases/general/patch_conflict/main.dart.strong.outline.expect
@@ -94,10 +94,10 @@
synthetic constructor •() → self2::ExistingOriginClass#0#1
;
}
-@_in::patch
+@/* from org-dartlang-testcase:///patch_lib.dart */ _in::patch
class Class extends core::Object {
@_in::patch
- constructor missingOriginConstructor() → self2::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ missingOriginConstructor() → self2::Class
;
constructor •() → self2::Class
;
diff --git a/pkg/front_end/testcases/general/patch_conflict/main.dart.strong.transformed.expect b/pkg/front_end/testcases/general/patch_conflict/main.dart.strong.transformed.expect
index 93c0fff..ca13ee5 100644
--- a/pkg/front_end/testcases/general/patch_conflict/main.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/patch_conflict/main.dart.strong.transformed.expect
@@ -99,7 +99,7 @@
@/* from org-dartlang-testcase:///patch_lib.dart */ #C1
class Class extends core::Object {
@#C1
- constructor missingOriginConstructor() → self2::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ missingOriginConstructor() → self2::Class
: super core::Object::•()
;
constructor •() → self2::Class
diff --git a/pkg/front_end/testcases/general/patch_extends_implements/main.dart.strong.outline.expect b/pkg/front_end/testcases/general/patch_extends_implements/main.dart.strong.outline.expect
index 539032f..b7a8691 100644
--- a/pkg/front_end/testcases/general/patch_extends_implements/main.dart.strong.outline.expect
+++ b/pkg/front_end/testcases/general/patch_extends_implements/main.dart.strong.outline.expect
@@ -67,32 +67,32 @@
synthetic constructor •() → self2::SuperClass
;
}
-@_in::patch
+@/* from org-dartlang-testcase:///patch_lib.dart */ _in::patch
abstract class Class1a extends core::Object {
synthetic constructor •() → self2::Class1a
;
}
-@_in::patch
+@/* from org-dartlang-testcase:///patch_lib.dart */ _in::patch
class Class1b extends core::Object {
synthetic constructor •() → self2::Class1b
;
}
-@_in::patch
+@/* from org-dartlang-testcase:///patch_lib.dart */ _in::patch
class Class2a extends self2::SuperClass {
synthetic constructor •() → self2::Class2a
;
}
-@_in::patch
+@/* from org-dartlang-testcase:///patch_lib.dart */ _in::patch
class Class2b extends core::Object {
synthetic constructor •() → self2::Class2b
;
}
-@_in::patch
+@/* from org-dartlang-testcase:///patch_lib.dart */ _in::patch
class Class3a extends core::Object implements self2::Interface {
synthetic constructor •() → self2::Class3a
;
}
-@_in::patch
+@/* from org-dartlang-testcase:///patch_lib.dart */ _in::patch
class Class3b extends core::Object {
synthetic constructor •() → self2::Class3b
;
@@ -102,62 +102,62 @@
: super core::Object::•()
;
}
-@_in::patch
+@/* from org-dartlang-testcase:///patch_lib.dart */ _in::patch
class Class4a extends self2::_Class4a&Object&Mixin {
synthetic constructor •() → self2::Class4a
;
}
-@_in::patch
+@/* from org-dartlang-testcase:///patch_lib.dart */ _in::patch
class Class4b extends core::Object {
synthetic constructor •() → self2::Class4b
;
}
-@_in::patch
+@/* from org-dartlang-testcase:///patch_lib.dart */ _in::patch
class Class5a extends core::Object {
@_in::patch
external static factory •() → self2::Class5a /* redirection-target: self2::Class5aImpl::• */
return new self2::Class5aImpl::•();
}
-@_in::patch
+@/* from org-dartlang-testcase:///patch_lib.dart */ _in::patch
class Class5aImpl extends core::Object implements self2::Class5a {
synthetic constructor •() → self2::Class5aImpl
;
}
-@_in::patch
+@/* from org-dartlang-testcase:///patch_lib.dart */ _in::patch
class Class5b extends core::Object {
@_in::patch
external static factory •() → self2::Class5b
return new self2::Class5bImpl::•();
}
-@_in::patch
+@/* from org-dartlang-testcase:///patch_lib.dart */ _in::patch
class Class5bImpl extends core::Object {
synthetic constructor •() → self2::Class5bImpl
;
}
-@_in::patch
+@/* from org-dartlang-testcase:///patch_lib.dart */ _in::patch
class Class5c extends core::Object {
@_in::patch
external static factory •() → self2::Class5c
return new self2::Class5cImpl::•();
}
-@_in::patch
+@/* from org-dartlang-testcase:///patch_lib.dart */ _in::patch
class Class5cImpl extends core::Object {
synthetic constructor •() → self2::Class5cImpl
;
}
-@_in::patch
+@/* from org-dartlang-testcase:///patch_lib.dart */ _in::patch
class Class6a<T extends core::Object? = dynamic> extends core::Object {
@_in::patch
external static factory •<T extends core::Object? = dynamic>((self2::Class6a::•::T%) → void f) → self2::Class6a<self2::Class6a::•::T%>
return new self2::_Class6aImpl::•<self2::Class6a::•::T%>(f);
}
-@_in::patch
+@/* from org-dartlang-testcase:///patch_lib.dart */ _in::patch
class Class6b<T extends core::Object? = dynamic> extends core::Object {
@_in::patch
external static factory •<T extends core::Object? = dynamic>((self2::Class6b::•::T%) → void f) → self2::Class6b<self2::Class6b::•::T%> /* redirection-target: self2::_Class6bImpl::•<self2::Class6b::•::T%>*/
return new self2::_Class6bImpl::•<self2::Class6b::•::T%>(f);
}
-@_in::patch
+@/* from org-dartlang-testcase:///patch_lib.dart */ _in::patch
class Class6c<T extends core::Object? = dynamic> extends core::Object {
@_in::patch
external static factory •<T extends core::Object? = dynamic>((self2::Class6c::•::T%) → void f) → self2::Class6c<self2::Class6c::•::T%>
diff --git a/pkg/front_end/testcases/general/patch_extension_scope/main.dart.strong.outline.expect b/pkg/front_end/testcases/general/patch_extension_scope/main.dart.strong.outline.expect
index 5c2b298..22bb92a 100644
--- a/pkg/front_end/testcases/general/patch_extension_scope/main.dart.strong.outline.expect
+++ b/pkg/front_end/testcases/general/patch_extension_scope/main.dart.strong.outline.expect
@@ -32,8 +32,8 @@
import "dart:_internal";
import "dart:_internal";
-@_in::patch
-@_in::patch
+@/* from org-dartlang-testcase:///patch_lib1.dart */ _in::patch
+@/* from org-dartlang-testcase:///patch_lib2.dart */ _in::patch
class Class extends core::Object {
synthetic constructor •() → test::Class
;
diff --git a/pkg/front_end/testcases/general/platform_invalid_uris/main.dart.strong.outline.expect b/pkg/front_end/testcases/general/platform_invalid_uris/main.dart.strong.outline.expect
index 4346feb..df95d9d 100644
--- a/pkg/front_end/testcases/general/platform_invalid_uris/main.dart.strong.outline.expect
+++ b/pkg/front_end/testcases/general/platform_invalid_uris/main.dart.strong.outline.expect
@@ -56,7 +56,7 @@
import "org-dartlang-malformed-uri:?%3Aa";
export "org-dartlang-malformed-uri:?%3Ab";
-@_in::patch
+@/* from org-dartlang-testcase:///patch_lib.dart */ _in::patch
class Class extends core::Object {
synthetic constructor •() → self2::Class
;
diff --git a/pkg/front_end/testcases/general/tear_off_patch/main.dart.strong.expect b/pkg/front_end/testcases/general/tear_off_patch/main.dart.strong.expect
index f8e56a0..d69e0c8 100644
--- a/pkg/front_end/testcases/general/tear_off_patch/main.dart.strong.expect
+++ b/pkg/front_end/testcases/general/tear_off_patch/main.dart.strong.expect
@@ -32,7 +32,7 @@
@/* from org-dartlang-testcase:///patch_lib.dart */ #C13
class Class<T extends core::Object? = dynamic> extends core::Object {
@#C13
- constructor •({core::bool defaultValue = #C14, required test::Class::T% value}) → test::Class<test::Class::T%>
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ •({core::bool defaultValue = #C14, required test::Class::T% value}) → test::Class<test::Class::T%>
: super core::Object::•() {
core::print("patch Class");
}
@@ -52,7 +52,7 @@
: super core::Object::•()
;
@#C13
- constructor patched({core::bool defaultValue = #C14, required test::ClassImpl::T% value}) → test::ClassImpl<test::ClassImpl::T%>
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ patched({core::bool defaultValue = #C14, required test::ClassImpl::T% value}) → test::ClassImpl<test::ClassImpl::T%>
: super core::Object::•() {
core::print("patch ClassImpl");
}
diff --git a/pkg/front_end/testcases/general/tear_off_patch/main.dart.strong.modular.expect b/pkg/front_end/testcases/general/tear_off_patch/main.dart.strong.modular.expect
index f8e56a0..d69e0c8 100644
--- a/pkg/front_end/testcases/general/tear_off_patch/main.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/general/tear_off_patch/main.dart.strong.modular.expect
@@ -32,7 +32,7 @@
@/* from org-dartlang-testcase:///patch_lib.dart */ #C13
class Class<T extends core::Object? = dynamic> extends core::Object {
@#C13
- constructor •({core::bool defaultValue = #C14, required test::Class::T% value}) → test::Class<test::Class::T%>
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ •({core::bool defaultValue = #C14, required test::Class::T% value}) → test::Class<test::Class::T%>
: super core::Object::•() {
core::print("patch Class");
}
@@ -52,7 +52,7 @@
: super core::Object::•()
;
@#C13
- constructor patched({core::bool defaultValue = #C14, required test::ClassImpl::T% value}) → test::ClassImpl<test::ClassImpl::T%>
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ patched({core::bool defaultValue = #C14, required test::ClassImpl::T% value}) → test::ClassImpl<test::ClassImpl::T%>
: super core::Object::•() {
core::print("patch ClassImpl");
}
diff --git a/pkg/front_end/testcases/general/tear_off_patch/main.dart.strong.outline.expect b/pkg/front_end/testcases/general/tear_off_patch/main.dart.strong.outline.expect
index 20e5b577..bb62035 100644
--- a/pkg/front_end/testcases/general/tear_off_patch/main.dart.strong.outline.expect
+++ b/pkg/front_end/testcases/general/tear_off_patch/main.dart.strong.outline.expect
@@ -15,7 +15,7 @@
typedef Alias<T extends core::num> = self2::Class<T>;
typedef AliasImpl<T extends core::num> = self2::ClassImpl<T>;
-@_in::patch
+@/* from org-dartlang-testcase:///patch_lib.dart */ _in::patch
class Class<T extends core::Object? = dynamic> extends core::Object {
@_in::patch
external constructor •({core::bool defaultValue = true, required self2::Class::T% value}) → self2::Class<self2::Class::T%>;
@@ -28,7 +28,7 @@
external static factory redirect2<T extends core::Object? = dynamic>({core::bool defaultValue = null, required self2::Class::redirect2::T% value}) → self2::Class<self2::Class::redirect2::T%> /* redirection-target: self2::ClassImpl::patched<self2::Class::redirect2::T%>*/
return new self2::ClassImpl::patched<self2::Class::redirect2::T%>(defaultValue: defaultValue, value: value);
}
-@_in::patch
+@/* from org-dartlang-testcase:///patch_lib.dart */ _in::patch
class ClassImpl<T extends core::Object? = dynamic> extends core::Object implements self2::Class<self2::ClassImpl::T%> {
constructor •({core::bool defaultValue = true, required self2::ClassImpl::T% value}) → self2::ClassImpl<self2::ClassImpl::T%>
;
diff --git a/pkg/front_end/testcases/general/tear_off_patch/main.dart.strong.transformed.expect b/pkg/front_end/testcases/general/tear_off_patch/main.dart.strong.transformed.expect
index f8e56a0..d69e0c8 100644
--- a/pkg/front_end/testcases/general/tear_off_patch/main.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/tear_off_patch/main.dart.strong.transformed.expect
@@ -32,7 +32,7 @@
@/* from org-dartlang-testcase:///patch_lib.dart */ #C13
class Class<T extends core::Object? = dynamic> extends core::Object {
@#C13
- constructor •({core::bool defaultValue = #C14, required test::Class::T% value}) → test::Class<test::Class::T%>
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ •({core::bool defaultValue = #C14, required test::Class::T% value}) → test::Class<test::Class::T%>
: super core::Object::•() {
core::print("patch Class");
}
@@ -52,7 +52,7 @@
: super core::Object::•()
;
@#C13
- constructor patched({core::bool defaultValue = #C14, required test::ClassImpl::T% value}) → test::ClassImpl<test::ClassImpl::T%>
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ patched({core::bool defaultValue = #C14, required test::ClassImpl::T% value}) → test::ClassImpl<test::ClassImpl::T%>
: super core::Object::•() {
core::print("patch ClassImpl");
}
diff --git a/pkg/front_end/testcases/late_lowering/injected_late_field_checks/main.dart.strong.expect b/pkg/front_end/testcases/late_lowering/injected_late_field_checks/main.dart.strong.expect
index eb81f6a..e169269 100644
--- a/pkg/front_end/testcases/late_lowering/injected_late_field_checks/main.dart.strong.expect
+++ b/pkg/front_end/testcases/late_lowering/injected_late_field_checks/main.dart.strong.expect
@@ -15,10 +15,10 @@
@/* from org-dartlang-testcase:///patch_lib.dart */ #C1
class Class extends core::Object {
field core::int? _#Class#foo = null /* from org-dartlang-testcase:///patch_lib.dart */;
- constructor bar() → self2::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ bar() → self2::Class
: super core::Object::•()
;
- constructor baz(core::int foo) → self2::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ baz(core::int foo) → self2::Class
: self2::Class::_#Class#foo = foo, super core::Object::•()
;
get /* from org-dartlang-testcase:///patch_lib.dart */ foo() → core::int
diff --git a/pkg/front_end/testcases/late_lowering/injected_late_field_checks/main.dart.strong.modular.expect b/pkg/front_end/testcases/late_lowering/injected_late_field_checks/main.dart.strong.modular.expect
index eb81f6a..e169269 100644
--- a/pkg/front_end/testcases/late_lowering/injected_late_field_checks/main.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/late_lowering/injected_late_field_checks/main.dart.strong.modular.expect
@@ -15,10 +15,10 @@
@/* from org-dartlang-testcase:///patch_lib.dart */ #C1
class Class extends core::Object {
field core::int? _#Class#foo = null /* from org-dartlang-testcase:///patch_lib.dart */;
- constructor bar() → self2::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ bar() → self2::Class
: super core::Object::•()
;
- constructor baz(core::int foo) → self2::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ baz(core::int foo) → self2::Class
: self2::Class::_#Class#foo = foo, super core::Object::•()
;
get /* from org-dartlang-testcase:///patch_lib.dart */ foo() → core::int
diff --git a/pkg/front_end/testcases/late_lowering/injected_late_field_checks/main.dart.strong.outline.expect b/pkg/front_end/testcases/late_lowering/injected_late_field_checks/main.dart.strong.outline.expect
index d31e08f..87eb401 100644
--- a/pkg/front_end/testcases/late_lowering/injected_late_field_checks/main.dart.strong.outline.expect
+++ b/pkg/front_end/testcases/late_lowering/injected_late_field_checks/main.dart.strong.outline.expect
@@ -13,12 +13,12 @@
import "dart:_internal";
-@_in::patch
+@/* from org-dartlang-testcase:///patch_lib.dart */ _in::patch
class Class extends core::Object {
field core::int? _#Class#foo /* from org-dartlang-testcase:///patch_lib.dart */;
- constructor bar() → self2::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ bar() → self2::Class
;
- constructor baz(core::int foo) → self2::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ baz(core::int foo) → self2::Class
;
get /* from org-dartlang-testcase:///patch_lib.dart */ foo() → core::int;
set /* from org-dartlang-testcase:///patch_lib.dart */ foo(core::int foo#param) → void;
diff --git a/pkg/front_end/testcases/late_lowering/injected_late_field_checks/main.dart.strong.transformed.expect b/pkg/front_end/testcases/late_lowering/injected_late_field_checks/main.dart.strong.transformed.expect
index eb81f6a..e169269 100644
--- a/pkg/front_end/testcases/late_lowering/injected_late_field_checks/main.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/late_lowering/injected_late_field_checks/main.dart.strong.transformed.expect
@@ -15,10 +15,10 @@
@/* from org-dartlang-testcase:///patch_lib.dart */ #C1
class Class extends core::Object {
field core::int? _#Class#foo = null /* from org-dartlang-testcase:///patch_lib.dart */;
- constructor bar() → self2::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ bar() → self2::Class
: super core::Object::•()
;
- constructor baz(core::int foo) → self2::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ baz(core::int foo) → self2::Class
: self2::Class::_#Class#foo = foo, super core::Object::•()
;
get /* from org-dartlang-testcase:///patch_lib.dart */ foo() → core::int
diff --git a/pkg/front_end/testcases/macros/inject_constructor.dart.strong.expect b/pkg/front_end/testcases/macros/inject_constructor.dart.strong.expect
index 9e9bbf6..cdb58c5 100644
--- a/pkg/front_end/testcases/macros/inject_constructor.dart.strong.expect
+++ b/pkg/front_end/testcases/macros/inject_constructor.dart.strong.expect
@@ -5,11 +5,11 @@
import "org-dartlang-testcase:///inject_constructor.dart";
class Class extends core::Object {
- constructor •() → self::Class
+ constructor /* from org-dartlang-testcase:///inject_constructor_lib.dart */ •() → self::Class
: super core::Object::•() {
core::print("injected");
}
- constructor named() → self::Class
+ constructor /* from org-dartlang-testcase:///inject_constructor_lib.dart */ named() → self::Class
: super core::Object::•() {
core::print("named-injected");
}
diff --git a/pkg/front_end/testcases/macros/inject_constructor.dart.strong.modular.expect b/pkg/front_end/testcases/macros/inject_constructor.dart.strong.modular.expect
index 9e9bbf6..cdb58c5 100644
--- a/pkg/front_end/testcases/macros/inject_constructor.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/macros/inject_constructor.dart.strong.modular.expect
@@ -5,11 +5,11 @@
import "org-dartlang-testcase:///inject_constructor.dart";
class Class extends core::Object {
- constructor •() → self::Class
+ constructor /* from org-dartlang-testcase:///inject_constructor_lib.dart */ •() → self::Class
: super core::Object::•() {
core::print("injected");
}
- constructor named() → self::Class
+ constructor /* from org-dartlang-testcase:///inject_constructor_lib.dart */ named() → self::Class
: super core::Object::•() {
core::print("named-injected");
}
diff --git a/pkg/front_end/testcases/macros/inject_constructor.dart.strong.outline.expect b/pkg/front_end/testcases/macros/inject_constructor.dart.strong.outline.expect
index 5935ec2..4800482 100644
--- a/pkg/front_end/testcases/macros/inject_constructor.dart.strong.outline.expect
+++ b/pkg/front_end/testcases/macros/inject_constructor.dart.strong.outline.expect
@@ -5,9 +5,9 @@
import "org-dartlang-testcase:///inject_constructor.dart";
class Class extends core::Object {
- constructor •() → self::Class
+ constructor /* from org-dartlang-testcase:///inject_constructor_lib.dart */ •() → self::Class
;
- constructor named() → self::Class
+ constructor /* from org-dartlang-testcase:///inject_constructor_lib.dart */ named() → self::Class
;
}
static method main() → dynamic
diff --git a/pkg/front_end/testcases/macros/inject_constructor.dart.strong.transformed.expect b/pkg/front_end/testcases/macros/inject_constructor.dart.strong.transformed.expect
index 9e9bbf6..cdb58c5 100644
--- a/pkg/front_end/testcases/macros/inject_constructor.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/macros/inject_constructor.dart.strong.transformed.expect
@@ -5,11 +5,11 @@
import "org-dartlang-testcase:///inject_constructor.dart";
class Class extends core::Object {
- constructor •() → self::Class
+ constructor /* from org-dartlang-testcase:///inject_constructor_lib.dart */ •() → self::Class
: super core::Object::•() {
core::print("injected");
}
- constructor named() → self::Class
+ constructor /* from org-dartlang-testcase:///inject_constructor_lib.dart */ named() → self::Class
: super core::Object::•() {
core::print("named-injected");
}
diff --git a/pkg/front_end/testcases/macros/scope_access.dart.strong.expect b/pkg/front_end/testcases/macros/scope_access.dart.strong.expect
index e0cd256..0a6621b 100644
--- a/pkg/front_end/testcases/macros/scope_access.dart.strong.expect
+++ b/pkg/front_end/testcases/macros/scope_access.dart.strong.expect
@@ -7,21 +7,21 @@
import "org-dartlang-testcase:///scope_access.dart";
class Class extends core::Object {
- constructor injectedConstructor1() → self::Class
+ constructor /* from org-dartlang-testcase:///scope_access_lib1.dart */ injectedConstructor1() → self::Class
: super core::Object::•() {
new self::Class::constructor();
new self::Class::injectedConstructor1();
new self::Class::injectedConstructor2();
new self::Class::_injectedConstructor3();
}
- constructor injectedConstructor2() → self::Class
+ constructor /* from org-dartlang-testcase:///scope_access_lib2.dart */ injectedConstructor2() → self::Class
: super core::Object::•() {
new self::Class::constructor();
new self::Class::injectedConstructor1();
new self::Class::injectedConstructor2();
new self::Class::_injectedConstructor3();
}
- constructor _injectedConstructor3() → self::Class
+ constructor /* from org-dartlang-testcase:///scope_access_lib3.dart */ _injectedConstructor3() → self::Class
: super core::Object::•() {
new self::Class::constructor();
new self::Class::injectedConstructor1();
diff --git a/pkg/front_end/testcases/macros/scope_access.dart.strong.modular.expect b/pkg/front_end/testcases/macros/scope_access.dart.strong.modular.expect
index e0cd256..0a6621b 100644
--- a/pkg/front_end/testcases/macros/scope_access.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/macros/scope_access.dart.strong.modular.expect
@@ -7,21 +7,21 @@
import "org-dartlang-testcase:///scope_access.dart";
class Class extends core::Object {
- constructor injectedConstructor1() → self::Class
+ constructor /* from org-dartlang-testcase:///scope_access_lib1.dart */ injectedConstructor1() → self::Class
: super core::Object::•() {
new self::Class::constructor();
new self::Class::injectedConstructor1();
new self::Class::injectedConstructor2();
new self::Class::_injectedConstructor3();
}
- constructor injectedConstructor2() → self::Class
+ constructor /* from org-dartlang-testcase:///scope_access_lib2.dart */ injectedConstructor2() → self::Class
: super core::Object::•() {
new self::Class::constructor();
new self::Class::injectedConstructor1();
new self::Class::injectedConstructor2();
new self::Class::_injectedConstructor3();
}
- constructor _injectedConstructor3() → self::Class
+ constructor /* from org-dartlang-testcase:///scope_access_lib3.dart */ _injectedConstructor3() → self::Class
: super core::Object::•() {
new self::Class::constructor();
new self::Class::injectedConstructor1();
diff --git a/pkg/front_end/testcases/macros/scope_access.dart.strong.outline.expect b/pkg/front_end/testcases/macros/scope_access.dart.strong.outline.expect
index de4f5cc..9416ed9 100644
--- a/pkg/front_end/testcases/macros/scope_access.dart.strong.outline.expect
+++ b/pkg/front_end/testcases/macros/scope_access.dart.strong.outline.expect
@@ -7,11 +7,11 @@
import "org-dartlang-testcase:///scope_access.dart";
class Class extends core::Object {
- constructor injectedConstructor1() → self::Class
+ constructor /* from org-dartlang-testcase:///scope_access_lib1.dart */ injectedConstructor1() → self::Class
;
- constructor injectedConstructor2() → self::Class
+ constructor /* from org-dartlang-testcase:///scope_access_lib2.dart */ injectedConstructor2() → self::Class
;
- constructor _injectedConstructor3() → self::Class
+ constructor /* from org-dartlang-testcase:///scope_access_lib3.dart */ _injectedConstructor3() → self::Class
;
constructor constructor() → self::Class
;
diff --git a/pkg/front_end/testcases/macros/scope_access.dart.strong.transformed.expect b/pkg/front_end/testcases/macros/scope_access.dart.strong.transformed.expect
index e0cd256..0a6621b 100644
--- a/pkg/front_end/testcases/macros/scope_access.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/macros/scope_access.dart.strong.transformed.expect
@@ -7,21 +7,21 @@
import "org-dartlang-testcase:///scope_access.dart";
class Class extends core::Object {
- constructor injectedConstructor1() → self::Class
+ constructor /* from org-dartlang-testcase:///scope_access_lib1.dart */ injectedConstructor1() → self::Class
: super core::Object::•() {
new self::Class::constructor();
new self::Class::injectedConstructor1();
new self::Class::injectedConstructor2();
new self::Class::_injectedConstructor3();
}
- constructor injectedConstructor2() → self::Class
+ constructor /* from org-dartlang-testcase:///scope_access_lib2.dart */ injectedConstructor2() → self::Class
: super core::Object::•() {
new self::Class::constructor();
new self::Class::injectedConstructor1();
new self::Class::injectedConstructor2();
new self::Class::_injectedConstructor3();
}
- constructor _injectedConstructor3() → self::Class
+ constructor /* from org-dartlang-testcase:///scope_access_lib3.dart */ _injectedConstructor3() → self::Class
: super core::Object::•() {
new self::Class::constructor();
new self::Class::injectedConstructor1();
diff --git a/pkg/front_end/testcases/nnbd/injected_late_field_checks/main.dart.strong.expect b/pkg/front_end/testcases/nnbd/injected_late_field_checks/main.dart.strong.expect
index 3a8af24..6b4f936 100644
--- a/pkg/front_end/testcases/nnbd/injected_late_field_checks/main.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/injected_late_field_checks/main.dart.strong.expect
@@ -15,10 +15,10 @@
@/* from org-dartlang-testcase:///patch_lib.dart */ #C1
class Class extends core::Object {
late field core::int foo /* from org-dartlang-testcase:///patch_lib.dart */;
- constructor bar() → self2::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ bar() → self2::Class
: super core::Object::•()
;
- constructor baz(core::int foo) → self2::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ baz(core::int foo) → self2::Class
: self2::Class::foo = foo, super core::Object::•()
;
}
diff --git a/pkg/front_end/testcases/nnbd/injected_late_field_checks/main.dart.strong.modular.expect b/pkg/front_end/testcases/nnbd/injected_late_field_checks/main.dart.strong.modular.expect
index 3a8af24..6b4f936 100644
--- a/pkg/front_end/testcases/nnbd/injected_late_field_checks/main.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/nnbd/injected_late_field_checks/main.dart.strong.modular.expect
@@ -15,10 +15,10 @@
@/* from org-dartlang-testcase:///patch_lib.dart */ #C1
class Class extends core::Object {
late field core::int foo /* from org-dartlang-testcase:///patch_lib.dart */;
- constructor bar() → self2::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ bar() → self2::Class
: super core::Object::•()
;
- constructor baz(core::int foo) → self2::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ baz(core::int foo) → self2::Class
: self2::Class::foo = foo, super core::Object::•()
;
}
diff --git a/pkg/front_end/testcases/nnbd/injected_late_field_checks/main.dart.strong.outline.expect b/pkg/front_end/testcases/nnbd/injected_late_field_checks/main.dart.strong.outline.expect
index 9e6ae34..8b25bd6 100644
--- a/pkg/front_end/testcases/nnbd/injected_late_field_checks/main.dart.strong.outline.expect
+++ b/pkg/front_end/testcases/nnbd/injected_late_field_checks/main.dart.strong.outline.expect
@@ -13,12 +13,12 @@
import "dart:_internal";
-@_in::patch
+@/* from org-dartlang-testcase:///patch_lib.dart */ _in::patch
class Class extends core::Object {
late field core::int foo /* from org-dartlang-testcase:///patch_lib.dart */;
- constructor bar() → self2::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ bar() → self2::Class
;
- constructor baz(core::int foo) → self2::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ baz(core::int foo) → self2::Class
;
}
diff --git a/pkg/front_end/testcases/nnbd/injected_late_field_checks/main.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/injected_late_field_checks/main.dart.strong.transformed.expect
index 3a8af24..6b4f936 100644
--- a/pkg/front_end/testcases/nnbd/injected_late_field_checks/main.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/injected_late_field_checks/main.dart.strong.transformed.expect
@@ -15,10 +15,10 @@
@/* from org-dartlang-testcase:///patch_lib.dart */ #C1
class Class extends core::Object {
late field core::int foo /* from org-dartlang-testcase:///patch_lib.dart */;
- constructor bar() → self2::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ bar() → self2::Class
: super core::Object::•()
;
- constructor baz(core::int foo) → self2::Class
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ baz(core::int foo) → self2::Class
: self2::Class::foo = foo, super core::Object::•()
;
}
diff --git a/pkg/front_end/testcases/nnbd/platform_definite_assignment/main.dart.strong.expect b/pkg/front_end/testcases/nnbd/platform_definite_assignment/main.dart.strong.expect
index 4adb050..982632b 100644
--- a/pkg/front_end/testcases/nnbd/platform_definite_assignment/main.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/platform_definite_assignment/main.dart.strong.expect
@@ -66,7 +66,7 @@
^" in k;
}
@#C1
- constructor patchedConstructor(core::int i, test::Class::T j) → test::Class<test::Class::T>
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ patchedConstructor(core::int i, test::Class::T j) → test::Class<test::Class::T>
: test::Class::a = i, test::Class::b = j, super core::Object::•() {
core::int k;
invalid-expression "pkg/front_end/testcases/nnbd/platform_definite_assignment/patch_lib.dart:15:5: Error: Non-nullable variable 'k' must be assigned before it can be used.
diff --git a/pkg/front_end/testcases/nnbd/platform_definite_assignment/main.dart.strong.modular.expect b/pkg/front_end/testcases/nnbd/platform_definite_assignment/main.dart.strong.modular.expect
index 4adb050..982632b 100644
--- a/pkg/front_end/testcases/nnbd/platform_definite_assignment/main.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/nnbd/platform_definite_assignment/main.dart.strong.modular.expect
@@ -66,7 +66,7 @@
^" in k;
}
@#C1
- constructor patchedConstructor(core::int i, test::Class::T j) → test::Class<test::Class::T>
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ patchedConstructor(core::int i, test::Class::T j) → test::Class<test::Class::T>
: test::Class::a = i, test::Class::b = j, super core::Object::•() {
core::int k;
invalid-expression "pkg/front_end/testcases/nnbd/platform_definite_assignment/patch_lib.dart:15:5: Error: Non-nullable variable 'k' must be assigned before it can be used.
diff --git a/pkg/front_end/testcases/nnbd/platform_definite_assignment/main.dart.strong.outline.expect b/pkg/front_end/testcases/nnbd/platform_definite_assignment/main.dart.strong.outline.expect
index 379ba5b..e943d18 100644
--- a/pkg/front_end/testcases/nnbd/platform_definite_assignment/main.dart.strong.outline.expect
+++ b/pkg/front_end/testcases/nnbd/platform_definite_assignment/main.dart.strong.outline.expect
@@ -13,7 +13,7 @@
import "dart:_internal";
-@_in::patch
+@/* from org-dartlang-testcase:///patch_lib.dart */ _in::patch
class Class<T extends core::num> extends core::Object /*hasConstConstructor*/ {
final field core::int a;
final field self2::Class::T b;
diff --git a/pkg/front_end/testcases/nnbd/platform_definite_assignment/main.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/platform_definite_assignment/main.dart.strong.transformed.expect
index 4adb050..982632b 100644
--- a/pkg/front_end/testcases/nnbd/platform_definite_assignment/main.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/platform_definite_assignment/main.dart.strong.transformed.expect
@@ -66,7 +66,7 @@
^" in k;
}
@#C1
- constructor patchedConstructor(core::int i, test::Class::T j) → test::Class<test::Class::T>
+ constructor /* from org-dartlang-testcase:///patch_lib.dart */ patchedConstructor(core::int i, test::Class::T j) → test::Class<test::Class::T>
: test::Class::a = i, test::Class::b = j, super core::Object::•() {
core::int k;
invalid-expression "pkg/front_end/testcases/nnbd/platform_definite_assignment/patch_lib.dart:15:5: Error: Non-nullable variable 'k' must be assigned before it can be used.
diff --git a/pkg/front_end/testcases/nnbd/platform_nonnullable_fields/main.dart.strong.expect b/pkg/front_end/testcases/nnbd/platform_nonnullable_fields/main.dart.strong.expect
index 1123c64..c61d853 100644
--- a/pkg/front_end/testcases/nnbd/platform_nonnullable_fields/main.dart.strong.expect
+++ b/pkg/front_end/testcases/nnbd/platform_nonnullable_fields/main.dart.strong.expect
@@ -46,7 +46,7 @@
@/* from org-dartlang-testcase:///patch_lib2.dart */ #C1
class Class2 extends core::Object {
field core::int _field /* from org-dartlang-testcase:///patch_lib2.dart */;
- constructor constructor2(core::int _field) → test::Class2
+ constructor /* from org-dartlang-testcase:///patch_lib2.dart */ constructor2(core::int _field) → test::Class2
: test::Class2::_field = _field, super core::Object::•()
;
constructor constructor1() → test::Class2
diff --git a/pkg/front_end/testcases/nnbd/platform_nonnullable_fields/main.dart.strong.modular.expect b/pkg/front_end/testcases/nnbd/platform_nonnullable_fields/main.dart.strong.modular.expect
index 1123c64..c61d853 100644
--- a/pkg/front_end/testcases/nnbd/platform_nonnullable_fields/main.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/nnbd/platform_nonnullable_fields/main.dart.strong.modular.expect
@@ -46,7 +46,7 @@
@/* from org-dartlang-testcase:///patch_lib2.dart */ #C1
class Class2 extends core::Object {
field core::int _field /* from org-dartlang-testcase:///patch_lib2.dart */;
- constructor constructor2(core::int _field) → test::Class2
+ constructor /* from org-dartlang-testcase:///patch_lib2.dart */ constructor2(core::int _field) → test::Class2
: test::Class2::_field = _field, super core::Object::•()
;
constructor constructor1() → test::Class2
diff --git a/pkg/front_end/testcases/nnbd/platform_nonnullable_fields/main.dart.strong.outline.expect b/pkg/front_end/testcases/nnbd/platform_nonnullable_fields/main.dart.strong.outline.expect
index 674052b..f46b90b 100644
--- a/pkg/front_end/testcases/nnbd/platform_nonnullable_fields/main.dart.strong.outline.expect
+++ b/pkg/front_end/testcases/nnbd/platform_nonnullable_fields/main.dart.strong.outline.expect
@@ -21,17 +21,17 @@
import "dart:_internal";
part patch_lib2.dart;
-@_in::patch
+@/* from org-dartlang-testcase:///patch_lib2.dart */ _in::patch
class Class1 extends core::Object {
field core::int _field /* from org-dartlang-testcase:///patch_lib2.dart */;
static field core::int _staticField /* from org-dartlang-testcase:///patch_lib2.dart */;
synthetic constructor •() → self2::Class1
;
}
-@_in::patch
+@/* from org-dartlang-testcase:///patch_lib2.dart */ _in::patch
class Class2 extends core::Object {
field core::int _field /* from org-dartlang-testcase:///patch_lib2.dart */;
- constructor constructor2(core::int _field) → self2::Class2
+ constructor /* from org-dartlang-testcase:///patch_lib2.dart */ constructor2(core::int _field) → self2::Class2
;
constructor constructor1() → self2::Class2
;
diff --git a/pkg/front_end/testcases/nnbd/platform_nonnullable_fields/main.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/platform_nonnullable_fields/main.dart.strong.transformed.expect
index 1123c64..c61d853 100644
--- a/pkg/front_end/testcases/nnbd/platform_nonnullable_fields/main.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/nnbd/platform_nonnullable_fields/main.dart.strong.transformed.expect
@@ -46,7 +46,7 @@
@/* from org-dartlang-testcase:///patch_lib2.dart */ #C1
class Class2 extends core::Object {
field core::int _field /* from org-dartlang-testcase:///patch_lib2.dart */;
- constructor constructor2(core::int _field) → test::Class2
+ constructor /* from org-dartlang-testcase:///patch_lib2.dart */ constructor2(core::int _field) → test::Class2
: test::Class2::_field = _field, super core::Object::•()
;
constructor constructor1() → test::Class2
diff --git a/pkg/front_end/testcases/nnbd/platform_optional_parameters/main.dart.strong.outline.expect b/pkg/front_end/testcases/nnbd/platform_optional_parameters/main.dart.strong.outline.expect
index ddbafe9..c234da4 100644
--- a/pkg/front_end/testcases/nnbd/platform_optional_parameters/main.dart.strong.outline.expect
+++ b/pkg/front_end/testcases/nnbd/platform_optional_parameters/main.dart.strong.outline.expect
@@ -46,7 +46,7 @@
import "dart:_internal";
-@_in::patch
+@/* from org-dartlang-testcase:///patch_lib.dart */ _in::patch
class Class extends core::Object {
synthetic constructor •() → self2::Class
;
diff --git a/pkg/front_end/testcases/nonfunction_type_aliases/unaliased_bounds_checks_in_constructor_calls_with_parts_main.dart.strong.expect b/pkg/front_end/testcases/nonfunction_type_aliases/unaliased_bounds_checks_in_constructor_calls_with_parts_main.dart.strong.expect
index e899a3b..ddf4f93 100644
--- a/pkg/front_end/testcases/nonfunction_type_aliases/unaliased_bounds_checks_in_constructor_calls_with_parts_main.dart.strong.expect
+++ b/pkg/front_end/testcases/nonfunction_type_aliases/unaliased_bounds_checks_in_constructor_calls_with_parts_main.dart.strong.expect
@@ -21,7 +21,7 @@
import "dart:core" as core;
part ./unaliased_bounds_checks_in_constructor_calls_with_parts_part_lib.dart;
-typedef A<X extends core::num, unrelated Y extends core::Object? = dynamic> = self2::C<X>;
+typedef /* from org-dartlang-testcase:///unaliased_bounds_checks_in_constructor_calls_with_parts_part_lib.dart */ A<X extends core::num, unrelated Y extends core::Object? = dynamic> = self2::C<X>;
class C<X extends core::Object? = dynamic> extends core::Object { // from org-dartlang-testcase:///unaliased_bounds_checks_in_constructor_calls_with_parts_part_lib.dart
synthetic constructor •() → self2::C<self2::C::X%>
: super core::Object::•()
diff --git a/pkg/front_end/testcases/nonfunction_type_aliases/unaliased_bounds_checks_in_constructor_calls_with_parts_main.dart.strong.modular.expect b/pkg/front_end/testcases/nonfunction_type_aliases/unaliased_bounds_checks_in_constructor_calls_with_parts_main.dart.strong.modular.expect
index e899a3b..ddf4f93 100644
--- a/pkg/front_end/testcases/nonfunction_type_aliases/unaliased_bounds_checks_in_constructor_calls_with_parts_main.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/nonfunction_type_aliases/unaliased_bounds_checks_in_constructor_calls_with_parts_main.dart.strong.modular.expect
@@ -21,7 +21,7 @@
import "dart:core" as core;
part ./unaliased_bounds_checks_in_constructor_calls_with_parts_part_lib.dart;
-typedef A<X extends core::num, unrelated Y extends core::Object? = dynamic> = self2::C<X>;
+typedef /* from org-dartlang-testcase:///unaliased_bounds_checks_in_constructor_calls_with_parts_part_lib.dart */ A<X extends core::num, unrelated Y extends core::Object? = dynamic> = self2::C<X>;
class C<X extends core::Object? = dynamic> extends core::Object { // from org-dartlang-testcase:///unaliased_bounds_checks_in_constructor_calls_with_parts_part_lib.dart
synthetic constructor •() → self2::C<self2::C::X%>
: super core::Object::•()
diff --git a/pkg/front_end/testcases/nonfunction_type_aliases/unaliased_bounds_checks_in_constructor_calls_with_parts_main.dart.strong.outline.expect b/pkg/front_end/testcases/nonfunction_type_aliases/unaliased_bounds_checks_in_constructor_calls_with_parts_main.dart.strong.outline.expect
index 1868904..229ef97 100644
--- a/pkg/front_end/testcases/nonfunction_type_aliases/unaliased_bounds_checks_in_constructor_calls_with_parts_main.dart.strong.outline.expect
+++ b/pkg/front_end/testcases/nonfunction_type_aliases/unaliased_bounds_checks_in_constructor_calls_with_parts_main.dart.strong.outline.expect
@@ -11,7 +11,7 @@
import "dart:core" as core;
part ./unaliased_bounds_checks_in_constructor_calls_with_parts_part_lib.dart;
-typedef A<X extends core::num, unrelated Y extends core::Object? = dynamic> = self2::C<X>;
+typedef /* from org-dartlang-testcase:///unaliased_bounds_checks_in_constructor_calls_with_parts_part_lib.dart */ A<X extends core::num, unrelated Y extends core::Object? = dynamic> = self2::C<X>;
class C<X extends core::Object? = dynamic> extends core::Object { // from org-dartlang-testcase:///unaliased_bounds_checks_in_constructor_calls_with_parts_part_lib.dart
synthetic constructor •() → self2::C<self2::C::X%>
;
diff --git a/pkg/front_end/testcases/nonfunction_type_aliases/unaliased_bounds_checks_in_constructor_calls_with_parts_main.dart.strong.transformed.expect b/pkg/front_end/testcases/nonfunction_type_aliases/unaliased_bounds_checks_in_constructor_calls_with_parts_main.dart.strong.transformed.expect
index e899a3b..ddf4f93 100644
--- a/pkg/front_end/testcases/nonfunction_type_aliases/unaliased_bounds_checks_in_constructor_calls_with_parts_main.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/nonfunction_type_aliases/unaliased_bounds_checks_in_constructor_calls_with_parts_main.dart.strong.transformed.expect
@@ -21,7 +21,7 @@
import "dart:core" as core;
part ./unaliased_bounds_checks_in_constructor_calls_with_parts_part_lib.dart;
-typedef A<X extends core::num, unrelated Y extends core::Object? = dynamic> = self2::C<X>;
+typedef /* from org-dartlang-testcase:///unaliased_bounds_checks_in_constructor_calls_with_parts_part_lib.dart */ A<X extends core::num, unrelated Y extends core::Object? = dynamic> = self2::C<X>;
class C<X extends core::Object? = dynamic> extends core::Object { // from org-dartlang-testcase:///unaliased_bounds_checks_in_constructor_calls_with_parts_part_lib.dart
synthetic constructor •() → self2::C<self2::C::X%>
: super core::Object::•()
diff --git a/pkg/kernel/lib/text/ast_to_text.dart b/pkg/kernel/lib/text/ast_to_text.dart
index c7c4f17..51d7af3 100644
--- a/pkg/kernel/lib/text/ast_to_text.dart
+++ b/pkg/kernel/lib/text/ast_to_text.dart
@@ -1179,6 +1179,9 @@
writeModifier(node.isSynthetic, 'synthetic');
writeWord('constructor');
List<String> features = <String>[];
+ if (node.enclosingClass.fileUri != node.fileUri) {
+ features.add(" from ${node.fileUri} ");
+ }
if (features.isNotEmpty) {
writeWord("/*${features.join(',')}*/");
}
@@ -1402,6 +1405,9 @@
writeAnnotationList(node.annotations);
writeIndentation();
writeWord('typedef');
+ if (node.enclosingLibrary.fileUri != node.fileUri) {
+ writeWord("/* from ${node.fileUri} */");
+ }
writeWord(node.name);
writeTypeParameterList(node.typeParameters);
writeSpaced('=');
@@ -1715,9 +1721,7 @@
@override
void visitFileUriExpression(FileUriExpression node) {
- if (node is FileUriConstantExpression) {
- writeWord('/* from ${node.fileUri} */');
- }
+ writeWord('/* from ${node.fileUri} */');
writeExpression(node.expression);
}
