From cdbb2a74a13cdd362dcc97f5414b515850eb4491 Mon Sep 17 00:00:00 2001 From: Dmitry Stefantsov Date: Fri, 14 Dec 2018 11:21:58 +0000 Subject: [PATCH] Reland [fasta] Invoke constructors of mixin applications in super invocations Reland of https://dart-review.googlesource.com/c/sdk/+/86200. TBR=aam@google.com Change-Id: Id3137cf5c7f87492db5bf3aabb505ac04529fa2c Reviewed-on: https://dart-review.googlesource.com/c/87079 Reviewed-by: Dmitry Stefantsov Commit-Queue: Dmitry Stefantsov --- pkg/compiler/lib/src/ssa/builder_kernel.dart | 4 -- .../lib/src/fasta/kernel/body_builder.dart | 6 -- .../lib/src/fasta/kernel/kernel_target.dart | 15 ++--- .../testcases/bug33099.dart.strong.expect | 2 +- .../bug33099.dart.strong.transformed.expect | 2 +- .../testcases/bug34511.dart.legacy.expect | 2 +- .../bug34511.dart.legacy.transformed.expect | 2 +- .../testcases/bug34511.dart.strong.expect | 2 +- .../bug34511.dart.strong.transformed.expect | 2 +- .../clone_function_type.dart.legacy.expect | 64 +++++++++---------- ...nction_type.dart.legacy.transformed.expect | 64 +++++++++---------- .../clone_function_type.dart.strong.expect | 64 +++++++++---------- ...nction_type.dart.strong.transformed.expect | 64 +++++++++---------- ..._field_overrides_getter.dart.legacy.expect | 2 +- ...ides_getter.dart.legacy.transformed.expect | 2 +- ..._field_overrides_getter.dart.strong.expect | 2 +- ...ides_getter.dart.strong.transformed.expect | 2 +- ..._field_overrides_setter.dart.legacy.expect | 2 +- ...ides_setter.dart.legacy.transformed.expect | 2 +- ..._field_overrides_setter.dart.strong.expect | 2 +- ...ides_setter.dart.strong.transformed.expect | 2 +- ...instantiate_to_bounds_1.dart.legacy.expect | 2 +- ...to_bounds_1.dart.legacy.transformed.expect | 2 +- ...instantiate_to_bounds_1.dart.strong.expect | 2 +- ...to_bounds_1.dart.strong.transformed.expect | 2 +- ...instantiate_to_bounds_2.dart.legacy.expect | 2 +- ...to_bounds_2.dart.legacy.transformed.expect | 2 +- ...instantiate_to_bounds_2.dart.strong.expect | 2 +- ...to_bounds_2.dart.strong.transformed.expect | 2 +- ...instantiate_to_bounds_3.dart.legacy.expect | 2 +- ...to_bounds_3.dart.legacy.transformed.expect | 2 +- ...instantiate_to_bounds_3.dart.strong.expect | 2 +- ...to_bounds_3.dart.strong.transformed.expect | 2 +- ...ce_multiple_constraints.dart.legacy.expect | 4 +- ...constraints.dart.legacy.transformed.expect | 4 +- ...ce_multiple_constraints.dart.strong.expect | 4 +- ...constraints.dart.strong.transformed.expect | 4 +- ...non_trivial_constraints.dart.legacy.expect | 2 +- ...constraints.dart.legacy.transformed.expect | 2 +- ...non_trivial_constraints.dart.strong.expect | 2 +- ...constraints.dart.strong.transformed.expect | 2 +- ...in_inference_outwards_1.dart.legacy.expect | 2 +- ..._outwards_1.dart.legacy.transformed.expect | 2 +- ...in_inference_outwards_1.dart.strong.expect | 2 +- ..._outwards_1.dart.strong.transformed.expect | 2 +- ...in_inference_outwards_2.dart.legacy.expect | 2 +- ..._outwards_2.dart.legacy.transformed.expect | 2 +- ...in_inference_outwards_2.dart.strong.expect | 2 +- ..._outwards_2.dart.strong.transformed.expect | 2 +- ...in_inference_outwards_3.dart.legacy.expect | 2 +- ..._outwards_3.dart.legacy.transformed.expect | 2 +- ...in_inference_outwards_3.dart.strong.expect | 2 +- ...in_inference_outwards_4.dart.legacy.expect | 2 +- ..._outwards_4.dart.legacy.transformed.expect | 2 +- ...in_inference_outwards_4.dart.strong.expect | 2 +- ...inference_unification_1.dart.legacy.expect | 2 +- ...ification_1.dart.legacy.transformed.expect | 2 +- ...inference_unification_1.dart.strong.expect | 2 +- ...inference_unification_2.dart.legacy.expect | 2 +- ...ification_2.dart.legacy.transformed.expect | 2 +- ...inference_unification_2.dart.strong.expect | 2 +- .../testcases/mixin.dart.legacy.expect | 6 +- .../mixin.dart.legacy.transformed.expect | 6 +- .../testcases/mixin.dart.strong.expect | 6 +- .../mixin.dart.strong.transformed.expect | 6 +- ...in_application_override.dart.legacy.expect | 12 ++-- ...on_override.dart.legacy.transformed.expect | 12 ++-- ...in_application_override.dart.strong.expect | 12 ++-- ...ors_with_default_values.dart.legacy.expect | 4 +- ...ault_values.dart.legacy.transformed.expect | 4 +- ...ors_with_default_values.dart.strong.expect | 4 +- ...ault_values.dart.strong.transformed.expect | 4 +- ...tter_for_mixed_in_field.dart.legacy.expect | 2 +- ...ed_in_field.dart.legacy.transformed.expect | 2 +- ...tter_for_mixed_in_field.dart.strong.expect | 2 +- ...ed_in_field.dart.strong.transformed.expect | 2 +- ...om_field_arent_mixed_in.dart.legacy.expect | 2 +- ...nt_mixed_in.dart.legacy.transformed.expect | 2 +- ...om_field_arent_mixed_in.dart.strong.expect | 2 +- ...nt_mixed_in.dart.strong.transformed.expect | 2 +- ...er_in_mixin_application.dart.legacy.expect | 2 +- ...application.dart.legacy.transformed.expect | 2 +- ...er_in_mixin_application.dart.strong.expect | 2 +- ...application.dart.strong.transformed.expect | 2 +- ..._not_assumed_from_mixin.dart.legacy.expect | 2 +- ..._from_mixin.dart.legacy.transformed.expect | 2 +- ..._not_assumed_from_mixin.dart.strong.expect | 2 +- ..._from_mixin.dart.strong.transformed.expect | 2 +- .../interface_with_nsm.dart.legacy.expect | 4 +- ...ce_with_nsm.dart.legacy.transformed.expect | 4 +- .../interface_with_nsm.dart.strong.expect | 4 +- ...ce_with_nsm.dart.strong.transformed.expect | 4 +- .../nsm_mixed_in.dart.legacy.expect | 2 +- ...sm_mixed_in.dart.legacy.transformed.expect | 2 +- .../nsm_mixed_in.dart.strong.expect | 2 +- ...sm_mixed_in.dart.strong.transformed.expect | 2 +- .../subst_on_forwarder.dart.legacy.expect | 2 +- ...n_forwarder.dart.legacy.transformed.expect | 2 +- .../subst_on_forwarder.dart.strong.expect | 2 +- ...n_forwarder.dart.strong.transformed.expect | 2 +- .../testcases/qualified.dart.legacy.expect | 2 +- .../qualified.dart.legacy.transformed.expect | 2 +- .../testcases/qualified.dart.strong.expect | 2 +- .../qualified.dart.strong.transformed.expect | 2 +- .../rasta/duplicated_mixin.dart.legacy.expect | 2 +- ...cated_mixin.dart.legacy.transformed.expect | 2 +- .../rasta/duplicated_mixin.dart.strong.expect | 2 +- ...cated_mixin.dart.strong.transformed.expect | 2 +- .../rasta/issue_000007.dart.legacy.expect | 2 +- ...ssue_000007.dart.legacy.transformed.expect | 2 +- .../rasta/issue_000007.dart.strong.expect | 2 +- ...ssue_000007.dart.strong.transformed.expect | 2 +- .../rasta/issue_000080.dart.legacy.expect | 2 +- ...ssue_000080.dart.legacy.transformed.expect | 2 +- .../rasta/issue_000080.dart.strong.expect | 2 +- ...ssue_000080.dart.strong.transformed.expect | 2 +- .../rasta/super_mixin.dart.legacy.expect | 4 +- ...super_mixin.dart.legacy.transformed.expect | 4 +- .../rasta/super_mixin.dart.strong.expect | 4 +- .../regress/issue_32182.dart.legacy.expect | 2 +- ...issue_32182.dart.legacy.transformed.expect | 2 +- .../regress/issue_32182.dart.strong.expect | 2 +- ...issue_32182.dart.strong.transformed.expect | 2 +- ..._forwarding_stub_getter.dart.legacy.expect | 2 +- ...stub_getter.dart.legacy.transformed.expect | 2 +- ..._forwarding_stub_getter.dart.strong.expect | 2 +- .../invalidation_new_class2.dart.expect | 2 +- 127 files changed, 293 insertions(+), 304 deletions(-) diff --git a/pkg/compiler/lib/src/ssa/builder_kernel.dart b/pkg/compiler/lib/src/ssa/builder_kernel.dart index 1f40b69d4e2..d5a20c04426 100644 --- a/pkg/compiler/lib/src/ssa/builder_kernel.dart +++ b/pkg/compiler/lib/src/ssa/builder_kernel.dart @@ -894,10 +894,6 @@ class KernelSsaGraphBuilder extends ir.Visitor ir.Class callerClass = caller.enclosingClass; ir.Supertype supertype = callerClass.supertype; - if (callerClass.mixedInType != null) { - _collectFieldValues(callerClass.mixedInType.classNode, constructorData); - } - // The class of the super-constructor may not be the supertype class. In // this case, we must go up the class hierarchy until we reach the class // containing the super-constructor. diff --git a/pkg/front_end/lib/src/fasta/kernel/body_builder.dart b/pkg/front_end/lib/src/fasta/kernel/body_builder.dart index 70f7382e9b2..5d3ad9e9b00 100644 --- a/pkg/front_end/lib/src/fasta/kernel/body_builder.dart +++ b/pkg/front_end/lib/src/fasta/kernel/body_builder.dart @@ -1576,9 +1576,6 @@ abstract class BodyBuilder extends ScopeListener Class cls = classBuilder.cls; if (isSuper) { cls = cls.superclass; - while (cls.isMixinApplication) { - cls = cls.superclass; - } } if (cls != null) { for (Constructor constructor in cls.constructors) { @@ -1605,9 +1602,6 @@ abstract class BodyBuilder extends ScopeListener if (isSuper) { builder = getSuperclass(builder)?.origin; - while (builder?.isMixinApplication ?? false) { - builder = getSuperclass(builder)?.origin; - } } if (builder != null) { Class target = builder.target; diff --git a/pkg/front_end/lib/src/fasta/kernel/kernel_target.dart b/pkg/front_end/lib/src/fasta/kernel/kernel_target.dart index ad363887a44..7a62b1a7179 100644 --- a/pkg/front_end/lib/src/fasta/kernel/kernel_target.dart +++ b/pkg/front_end/lib/src/fasta/kernel/kernel_target.dart @@ -822,14 +822,13 @@ class KernelTarget extends TargetImplementation { /// arguments. Constructor defaultSuperConstructor(Class cls) { Class superclass = cls.superclass; - while (superclass != null && superclass.isMixinApplication) { - superclass = superclass.superclass; - } - for (Constructor constructor in superclass.constructors) { - if (constructor.name.name.isEmpty) { - return constructor.function.requiredParameterCount == 0 - ? constructor - : null; + if (superclass != null) { + for (Constructor constructor in superclass.constructors) { + if (constructor.name.name.isEmpty) { + return constructor.function.requiredParameterCount == 0 + ? constructor + : null; + } } } return null; diff --git a/pkg/front_end/testcases/bug33099.dart.strong.expect b/pkg/front_end/testcases/bug33099.dart.strong.expect index 42934172c07..c7454390b6b 100644 --- a/pkg/front_end/testcases/bug33099.dart.strong.expect +++ b/pkg/front_end/testcases/bug33099.dart.strong.expect @@ -22,7 +22,7 @@ abstract class _MyTest2&Object&MyTest = core::Object with self::MyTest { } class MyTest2 extends self::_MyTest2&Object&MyTest { synthetic constructor •() → self::MyTest2 - : super core::Object::•() + : super self::_MyTest2&Object&MyTest::•() ; } static const field self::_FailingTest failingTest = const self::_FailingTest::•(); diff --git a/pkg/front_end/testcases/bug33099.dart.strong.transformed.expect b/pkg/front_end/testcases/bug33099.dart.strong.transformed.expect index a8c371a5165..a2f4a982838 100644 --- a/pkg/front_end/testcases/bug33099.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/bug33099.dart.strong.transformed.expect @@ -24,7 +24,7 @@ abstract class _MyTest2&Object&MyTest extends core::Object implements self::MyTe } class MyTest2 extends self::_MyTest2&Object&MyTest { synthetic constructor •() → self::MyTest2 - : super core::Object::•() + : super self::_MyTest2&Object&MyTest::•() ; } static const field self::_FailingTest failingTest = const self::_FailingTest::•(); diff --git a/pkg/front_end/testcases/bug34511.dart.legacy.expect b/pkg/front_end/testcases/bug34511.dart.legacy.expect index ebad4e69839..c3b2cc546aa 100644 --- a/pkg/front_end/testcases/bug34511.dart.legacy.expect +++ b/pkg/front_end/testcases/bug34511.dart.legacy.expect @@ -14,7 +14,7 @@ abstract class _B&Object&A = core::Object with } class B extends self::_B&Object&A { synthetic constructor •() → self::B - : super core::Object::•() + : super self::_B&Object&A::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/bug34511.dart.legacy.transformed.expect b/pkg/front_end/testcases/bug34511.dart.legacy.transformed.expect index 739a1e46f49..2f2a19d63b7 100644 --- a/pkg/front_end/testcases/bug34511.dart.legacy.transformed.expect +++ b/pkg/front_end/testcases/bug34511.dart.legacy.transformed.expect @@ -14,7 +14,7 @@ abstract class _B&Object&A extends core::Objec } class B extends self::_B&Object&A { synthetic constructor •() → self::B - : super core::Object::•() + : super self::_B&Object&A::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/bug34511.dart.strong.expect b/pkg/front_end/testcases/bug34511.dart.strong.expect index ebad4e69839..c3b2cc546aa 100644 --- a/pkg/front_end/testcases/bug34511.dart.strong.expect +++ b/pkg/front_end/testcases/bug34511.dart.strong.expect @@ -14,7 +14,7 @@ abstract class _B&Object&A = core::Object with } class B extends self::_B&Object&A { synthetic constructor •() → self::B - : super core::Object::•() + : super self::_B&Object&A::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/bug34511.dart.strong.transformed.expect b/pkg/front_end/testcases/bug34511.dart.strong.transformed.expect index 739a1e46f49..2f2a19d63b7 100644 --- a/pkg/front_end/testcases/bug34511.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/bug34511.dart.strong.transformed.expect @@ -14,7 +14,7 @@ abstract class _B&Object&A extends core::Objec } class B extends self::_B&Object&A { synthetic constructor •() → self::B - : super core::Object::•() + : super self::_B&Object&A::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/clone_function_type.dart.legacy.expect b/pkg/front_end/testcases/clone_function_type.dart.legacy.expect index a1b55e6565b..52b22ab8d56 100644 --- a/pkg/front_end/testcases/clone_function_type.dart.legacy.expect +++ b/pkg/front_end/testcases/clone_function_type.dart.legacy.expect @@ -76,7 +76,7 @@ abstract class _Bm1&Object&Am1 = core::Object } class Bm1 extends self::_Bm1&Object&Am1 { synthetic constructor •() → self::Bm1 - : super core::Object::•() + : super self::_Bm1&Object&Am1::•() ; } abstract class _Cm1&Object&Am1 = core::Object with self::Am1<(core::int) → dynamic, self::_Cm1&Object&Am1::Z> { @@ -86,7 +86,7 @@ abstract class _Cm1&Object&Am1 = core::Object } class Cm1 extends self::_Cm1&Object&Am1 { synthetic constructor •() → self::Cm1 - : super core::Object::•() + : super self::_Cm1&Object&Am1::•() ; } abstract class _Dm1&Object&Am1 = core::Object with self::Am1<() → core::int, self::_Dm1&Object&Am1::Z> { @@ -96,7 +96,7 @@ abstract class _Dm1&Object&Am1 = core::Object } class Dm1 extends self::_Dm1&Object&Am1 { synthetic constructor •() → self::Dm1 - : super core::Object::•() + : super self::_Dm1&Object&Am1::•() ; } abstract class _Em1&Object&Am1 = core::Object with self::Am1<() → dynamic, self::_Em1&Object&Am1::Z> { @@ -106,7 +106,7 @@ abstract class _Em1&Object&Am1 = core::Object } class Em1 extends self::_Em1&Object&Am1 { synthetic constructor •() → self::Em1 - : super core::Object::•() + : super self::_Em1&Object&Am1::•() ; } abstract class _Fm1&Object&Am1 = core::Object with self::Am1<() → dynamic, self::_Fm1&Object&Am1::Z> { @@ -116,7 +116,7 @@ abstract class _Fm1&Object&Am1 = core::Object } class Fm1 extends self::_Fm1&Object&Am1 { synthetic constructor •() → self::Fm1 - : super core::Object::•() + : super self::_Fm1&Object&Am1::•() ; } abstract class _Gm1&Object&Am1 = core::Object with self::Am1<({x: core::int}) → dynamic, self::_Gm1&Object&Am1::Z> { @@ -126,7 +126,7 @@ abstract class _Gm1&Object&Am1 = core::Object } class Gm1 extends self::_Gm1&Object&Am1 { synthetic constructor •() → self::Gm1 - : super core::Object::•() + : super self::_Gm1&Object&Am1::•() ; } abstract class _Hm1&Object&Am1 = core::Object with self::Am1<([core::int]) → dynamic, self::_Hm1&Object&Am1::Z> { @@ -136,7 +136,7 @@ abstract class _Hm1&Object&Am1 = core::Object } class Hm1 extends self::_Hm1&Object&Am1 { synthetic constructor •() → self::Hm1 - : super core::Object::•() + : super self::_Hm1&Object&Am1::•() ; } abstract class _Im1&Object&Am1 = core::Object with self::Am1<([core::int]) → dynamic, self::_Im1&Object&Am1::Z> { @@ -146,7 +146,7 @@ abstract class _Im1&Object&Am1 = core::Object } class Im1 extends self::_Im1&Object&Am1 { synthetic constructor •() → self::Im1 - : super core::Object::•() + : super self::_Im1&Object&Am1::•() ; } abstract class _Jm1&Object&Am1 = core::Object with self::Am1 { @@ -156,7 +156,7 @@ abstract class _Jm1&Object&Am1 = core::Object } class Jm1 extends self::_Jm1&Object&Am1 { synthetic constructor •() → self::Jm1 - : super core::Object::•() + : super self::_Jm1&Object&Am1::•() ; } abstract class _Km1&Object&Am1 = core::Object with self::Am1<(core::Function) → dynamic, self::_Km1&Object&Am1::Z> { @@ -166,7 +166,7 @@ abstract class _Km1&Object&Am1 = core::Object } class Km1 extends self::_Km1&Object&Am1 { synthetic constructor •() → self::Km1 - : super core::Object::•() + : super self::_Km1&Object&Am1::•() ; } abstract class _Lm1&Object&Am1 = core::Object with self::Am1<() → (() → core::Function) → dynamic, self::_Lm1&Object&Am1::Z> { @@ -176,7 +176,7 @@ abstract class _Lm1&Object&Am1 = core::Object } class Lm1 extends self::_Lm1&Object&Am1 { synthetic constructor •() → self::Lm1 - : super core::Object::•() + : super self::_Lm1&Object&Am1::•() ; } class Mm1 = core::Object with self::Am1<(core::int) → dynamic, self::Mm1::Z> { @@ -246,7 +246,7 @@ abstract class _Bm2&Object&Am2 = core::Object } class Bm2 extends self::_Bm2&Object&Am2 { synthetic constructor •() → self::Bm2 - : super core::Object::•() + : super self::_Bm2&Object&Am2::•() ; } abstract class _Cm2&Object&Am2 = core::Object with self::Am2<(core::int) → dynamic, self::_Cm2&Object&Am2::Z> { @@ -256,7 +256,7 @@ abstract class _Cm2&Object&Am2 = core::Object } class Cm2 extends self::_Cm2&Object&Am2 { synthetic constructor •() → self::Cm2 - : super core::Object::•() + : super self::_Cm2&Object&Am2::•() ; } abstract class _Dm2&Object&Am2 = core::Object with self::Am2<() → core::int, self::_Dm2&Object&Am2::Z> { @@ -266,7 +266,7 @@ abstract class _Dm2&Object&Am2 = core::Object } class Dm2 extends self::_Dm2&Object&Am2 { synthetic constructor •() → self::Dm2 - : super core::Object::•() + : super self::_Dm2&Object&Am2::•() ; } abstract class _Em2&Object&Am2 = core::Object with self::Am2<() → dynamic, self::_Em2&Object&Am2::Z> { @@ -276,7 +276,7 @@ abstract class _Em2&Object&Am2 = core::Object } class Em2 extends self::_Em2&Object&Am2 { synthetic constructor •() → self::Em2 - : super core::Object::•() + : super self::_Em2&Object&Am2::•() ; } abstract class _Fm2&Object&Am2 = core::Object with self::Am2<() → dynamic, self::_Fm2&Object&Am2::Z> { @@ -286,7 +286,7 @@ abstract class _Fm2&Object&Am2 = core::Object } class Fm2 extends self::_Fm2&Object&Am2 { synthetic constructor •() → self::Fm2 - : super core::Object::•() + : super self::_Fm2&Object&Am2::•() ; } abstract class _Gm2&Object&Am2 = core::Object with self::Am2<({x: core::int}) → dynamic, self::_Gm2&Object&Am2::Z> { @@ -296,7 +296,7 @@ abstract class _Gm2&Object&Am2 = core::Object } class Gm2 extends self::_Gm2&Object&Am2 { synthetic constructor •() → self::Gm2 - : super core::Object::•() + : super self::_Gm2&Object&Am2::•() ; } abstract class _Hm2&Object&Am2 = core::Object with self::Am2<([core::int]) → dynamic, self::_Hm2&Object&Am2::Z> { @@ -306,7 +306,7 @@ abstract class _Hm2&Object&Am2 = core::Object } class Hm2 extends self::_Hm2&Object&Am2 { synthetic constructor •() → self::Hm2 - : super core::Object::•() + : super self::_Hm2&Object&Am2::•() ; } abstract class _Im2&Object&Am2 = core::Object with self::Am2<([core::int]) → dynamic, self::_Im2&Object&Am2::Z> { @@ -316,7 +316,7 @@ abstract class _Im2&Object&Am2 = core::Object } class Im2 extends self::_Im2&Object&Am2 { synthetic constructor •() → self::Im2 - : super core::Object::•() + : super self::_Im2&Object&Am2::•() ; } abstract class _Jm2&Object&Am2 = core::Object with self::Am2 { @@ -326,7 +326,7 @@ abstract class _Jm2&Object&Am2 = core::Object } class Jm2 extends self::_Jm2&Object&Am2 { synthetic constructor •() → self::Jm2 - : super core::Object::•() + : super self::_Jm2&Object&Am2::•() ; } abstract class _Km2&Object&Am2 = core::Object with self::Am2<(core::Function) → dynamic, self::_Km2&Object&Am2::Z> { @@ -336,7 +336,7 @@ abstract class _Km2&Object&Am2 = core::Object } class Km2 extends self::_Km2&Object&Am2 { synthetic constructor •() → self::Km2 - : super core::Object::•() + : super self::_Km2&Object&Am2::•() ; } abstract class _Lm2&Object&Am2 = core::Object with self::Am2<() → (() → core::Function) → dynamic, self::_Lm2&Object&Am2::Z> { @@ -346,7 +346,7 @@ abstract class _Lm2&Object&Am2 = core::Object } class Lm2 extends self::_Lm2&Object&Am2 { synthetic constructor •() → self::Lm2 - : super core::Object::•() + : super self::_Lm2&Object&Am2::•() ; } class Mm2 = core::Object with self::Am2<(core::int) → dynamic, self::Mm2::Z> { @@ -416,7 +416,7 @@ abstract class _Bm3&Object&Am3 = core::Object } class Bm3 extends self::_Bm3&Object&Am3 { synthetic constructor •() → self::Bm3 - : super core::Object::•() + : super self::_Bm3&Object&Am3::•() ; } abstract class _Cm3&Object&Am3 = core::Object with self::Am3<(core::int) → dynamic, self::_Cm3&Object&Am3::Z> { @@ -426,7 +426,7 @@ abstract class _Cm3&Object&Am3 = core::Object } class Cm3 extends self::_Cm3&Object&Am3 { synthetic constructor •() → self::Cm3 - : super core::Object::•() + : super self::_Cm3&Object&Am3::•() ; } abstract class _Dm3&Object&Am3 = core::Object with self::Am3<() → core::int, self::_Dm3&Object&Am3::Z> { @@ -436,7 +436,7 @@ abstract class _Dm3&Object&Am3 = core::Object } class Dm3 extends self::_Dm3&Object&Am3 { synthetic constructor •() → self::Dm3 - : super core::Object::•() + : super self::_Dm3&Object&Am3::•() ; } abstract class _Em3&Object&Am3 = core::Object with self::Am3<() → dynamic, self::_Em3&Object&Am3::Z> { @@ -446,7 +446,7 @@ abstract class _Em3&Object&Am3 = core::Object } class Em3 extends self::_Em3&Object&Am3 { synthetic constructor •() → self::Em3 - : super core::Object::•() + : super self::_Em3&Object&Am3::•() ; } abstract class _Fm3&Object&Am3 = core::Object with self::Am3<() → dynamic, self::_Fm3&Object&Am3::Z> { @@ -456,7 +456,7 @@ abstract class _Fm3&Object&Am3 = core::Object } class Fm3 extends self::_Fm3&Object&Am3 { synthetic constructor •() → self::Fm3 - : super core::Object::•() + : super self::_Fm3&Object&Am3::•() ; } abstract class _Gm3&Object&Am3 = core::Object with self::Am3<({x: core::int}) → dynamic, self::_Gm3&Object&Am3::Z> { @@ -466,7 +466,7 @@ abstract class _Gm3&Object&Am3 = core::Object } class Gm3 extends self::_Gm3&Object&Am3 { synthetic constructor •() → self::Gm3 - : super core::Object::•() + : super self::_Gm3&Object&Am3::•() ; } abstract class _Hm3&Object&Am3 = core::Object with self::Am3<([core::int]) → dynamic, self::_Hm3&Object&Am3::Z> { @@ -476,7 +476,7 @@ abstract class _Hm3&Object&Am3 = core::Object } class Hm3 extends self::_Hm3&Object&Am3 { synthetic constructor •() → self::Hm3 - : super core::Object::•() + : super self::_Hm3&Object&Am3::•() ; } abstract class _Im3&Object&Am3 = core::Object with self::Am3<([core::int]) → dynamic, self::_Im3&Object&Am3::Z> { @@ -486,7 +486,7 @@ abstract class _Im3&Object&Am3 = core::Object } class Im3 extends self::_Im3&Object&Am3 { synthetic constructor •() → self::Im3 - : super core::Object::•() + : super self::_Im3&Object&Am3::•() ; } abstract class _Jm3&Object&Am3 = core::Object with self::Am3<(core::Function) → dynamic, self::_Jm3&Object&Am3::Z> { @@ -496,7 +496,7 @@ abstract class _Jm3&Object&Am3 = core::Object } class Jm3 extends self::_Jm3&Object&Am3 { synthetic constructor •() → self::Jm3 - : super core::Object::•() + : super self::_Jm3&Object&Am3::•() ; } abstract class _Km3&Object&Am3 = core::Object with self::Am3<() → (() → core::Function) → dynamic, self::_Km3&Object&Am3::Z> { @@ -506,7 +506,7 @@ abstract class _Km3&Object&Am3 = core::Object } class Km3 extends self::_Km3&Object&Am3 { synthetic constructor •() → self::Km3 - : super core::Object::•() + : super self::_Km3&Object&Am3::•() ; } class Af1 extends core::Object { diff --git a/pkg/front_end/testcases/clone_function_type.dart.legacy.transformed.expect b/pkg/front_end/testcases/clone_function_type.dart.legacy.transformed.expect index 8508c167f1b..e33af866b0c 100644 --- a/pkg/front_end/testcases/clone_function_type.dart.legacy.transformed.expect +++ b/pkg/front_end/testcases/clone_function_type.dart.legacy.transformed.expect @@ -50,7 +50,7 @@ abstract class _Bm1&Object&Am1 extends core::O } class Bm1 extends self::_Bm1&Object&Am1 { synthetic constructor •() → self::Bm1 - : super core::Object::•() + : super self::_Bm1&Object&Am1::•() ; } abstract class _Cm1&Object&Am1 extends core::Object implements self::Am1<(core::int) → dynamic, self::_Cm1&Object&Am1::Z> { @@ -60,7 +60,7 @@ abstract class _Cm1&Object&Am1 extends core::O } class Cm1 extends self::_Cm1&Object&Am1 { synthetic constructor •() → self::Cm1 - : super core::Object::•() + : super self::_Cm1&Object&Am1::•() ; } abstract class _Dm1&Object&Am1 extends core::Object implements self::Am1<() → core::int, self::_Dm1&Object&Am1::Z> { @@ -70,7 +70,7 @@ abstract class _Dm1&Object&Am1 extends core::O } class Dm1 extends self::_Dm1&Object&Am1 { synthetic constructor •() → self::Dm1 - : super core::Object::•() + : super self::_Dm1&Object&Am1::•() ; } abstract class _Em1&Object&Am1 extends core::Object implements self::Am1<() → dynamic, self::_Em1&Object&Am1::Z> { @@ -80,7 +80,7 @@ abstract class _Em1&Object&Am1 extends core::O } class Em1 extends self::_Em1&Object&Am1 { synthetic constructor •() → self::Em1 - : super core::Object::•() + : super self::_Em1&Object&Am1::•() ; } abstract class _Fm1&Object&Am1 extends core::Object implements self::Am1<() → dynamic, self::_Fm1&Object&Am1::Z> { @@ -90,7 +90,7 @@ abstract class _Fm1&Object&Am1 extends core::O } class Fm1 extends self::_Fm1&Object&Am1 { synthetic constructor •() → self::Fm1 - : super core::Object::•() + : super self::_Fm1&Object&Am1::•() ; } abstract class _Gm1&Object&Am1 extends core::Object implements self::Am1<({x: core::int}) → dynamic, self::_Gm1&Object&Am1::Z> { @@ -100,7 +100,7 @@ abstract class _Gm1&Object&Am1 extends core::O } class Gm1 extends self::_Gm1&Object&Am1 { synthetic constructor •() → self::Gm1 - : super core::Object::•() + : super self::_Gm1&Object&Am1::•() ; } abstract class _Hm1&Object&Am1 extends core::Object implements self::Am1<([core::int]) → dynamic, self::_Hm1&Object&Am1::Z> { @@ -110,7 +110,7 @@ abstract class _Hm1&Object&Am1 extends core::O } class Hm1 extends self::_Hm1&Object&Am1 { synthetic constructor •() → self::Hm1 - : super core::Object::•() + : super self::_Hm1&Object&Am1::•() ; } abstract class _Im1&Object&Am1 extends core::Object implements self::Am1<([core::int]) → dynamic, self::_Im1&Object&Am1::Z> { @@ -120,7 +120,7 @@ abstract class _Im1&Object&Am1 extends core::O } class Im1 extends self::_Im1&Object&Am1 { synthetic constructor •() → self::Im1 - : super core::Object::•() + : super self::_Im1&Object&Am1::•() ; } abstract class _Jm1&Object&Am1 extends core::Object implements self::Am1 { @@ -130,7 +130,7 @@ abstract class _Jm1&Object&Am1 extends core::O } class Jm1 extends self::_Jm1&Object&Am1 { synthetic constructor •() → self::Jm1 - : super core::Object::•() + : super self::_Jm1&Object&Am1::•() ; } abstract class _Km1&Object&Am1 extends core::Object implements self::Am1<(core::Function) → dynamic, self::_Km1&Object&Am1::Z> { @@ -140,7 +140,7 @@ abstract class _Km1&Object&Am1 extends core::O } class Km1 extends self::_Km1&Object&Am1 { synthetic constructor •() → self::Km1 - : super core::Object::•() + : super self::_Km1&Object&Am1::•() ; } abstract class _Lm1&Object&Am1 extends core::Object implements self::Am1<() → (() → core::Function) → dynamic, self::_Lm1&Object&Am1::Z> { @@ -150,7 +150,7 @@ abstract class _Lm1&Object&Am1 extends core::O } class Lm1 extends self::_Lm1&Object&Am1 { synthetic constructor •() → self::Lm1 - : super core::Object::•() + : super self::_Lm1&Object&Am1::•() ; } class Mm1 extends core::Object implements self::Am1<(core::int) → dynamic, self::Mm1::Z> { @@ -220,7 +220,7 @@ abstract class _Bm2&Object&Am2 extends core::O } class Bm2 extends self::_Bm2&Object&Am2 { synthetic constructor •() → self::Bm2 - : super core::Object::•() + : super self::_Bm2&Object&Am2::•() ; } abstract class _Cm2&Object&Am2 extends core::Object implements self::Am2<(core::int) → dynamic, self::_Cm2&Object&Am2::Z> { @@ -230,7 +230,7 @@ abstract class _Cm2&Object&Am2 extends core::O } class Cm2 extends self::_Cm2&Object&Am2 { synthetic constructor •() → self::Cm2 - : super core::Object::•() + : super self::_Cm2&Object&Am2::•() ; } abstract class _Dm2&Object&Am2 extends core::Object implements self::Am2<() → core::int, self::_Dm2&Object&Am2::Z> { @@ -240,7 +240,7 @@ abstract class _Dm2&Object&Am2 extends core::O } class Dm2 extends self::_Dm2&Object&Am2 { synthetic constructor •() → self::Dm2 - : super core::Object::•() + : super self::_Dm2&Object&Am2::•() ; } abstract class _Em2&Object&Am2 extends core::Object implements self::Am2<() → dynamic, self::_Em2&Object&Am2::Z> { @@ -250,7 +250,7 @@ abstract class _Em2&Object&Am2 extends core::O } class Em2 extends self::_Em2&Object&Am2 { synthetic constructor •() → self::Em2 - : super core::Object::•() + : super self::_Em2&Object&Am2::•() ; } abstract class _Fm2&Object&Am2 extends core::Object implements self::Am2<() → dynamic, self::_Fm2&Object&Am2::Z> { @@ -260,7 +260,7 @@ abstract class _Fm2&Object&Am2 extends core::O } class Fm2 extends self::_Fm2&Object&Am2 { synthetic constructor •() → self::Fm2 - : super core::Object::•() + : super self::_Fm2&Object&Am2::•() ; } abstract class _Gm2&Object&Am2 extends core::Object implements self::Am2<({x: core::int}) → dynamic, self::_Gm2&Object&Am2::Z> { @@ -270,7 +270,7 @@ abstract class _Gm2&Object&Am2 extends core::O } class Gm2 extends self::_Gm2&Object&Am2 { synthetic constructor •() → self::Gm2 - : super core::Object::•() + : super self::_Gm2&Object&Am2::•() ; } abstract class _Hm2&Object&Am2 extends core::Object implements self::Am2<([core::int]) → dynamic, self::_Hm2&Object&Am2::Z> { @@ -280,7 +280,7 @@ abstract class _Hm2&Object&Am2 extends core::O } class Hm2 extends self::_Hm2&Object&Am2 { synthetic constructor •() → self::Hm2 - : super core::Object::•() + : super self::_Hm2&Object&Am2::•() ; } abstract class _Im2&Object&Am2 extends core::Object implements self::Am2<([core::int]) → dynamic, self::_Im2&Object&Am2::Z> { @@ -290,7 +290,7 @@ abstract class _Im2&Object&Am2 extends core::O } class Im2 extends self::_Im2&Object&Am2 { synthetic constructor •() → self::Im2 - : super core::Object::•() + : super self::_Im2&Object&Am2::•() ; } abstract class _Jm2&Object&Am2 extends core::Object implements self::Am2 { @@ -300,7 +300,7 @@ abstract class _Jm2&Object&Am2 extends core::O } class Jm2 extends self::_Jm2&Object&Am2 { synthetic constructor •() → self::Jm2 - : super core::Object::•() + : super self::_Jm2&Object&Am2::•() ; } abstract class _Km2&Object&Am2 extends core::Object implements self::Am2<(core::Function) → dynamic, self::_Km2&Object&Am2::Z> { @@ -310,7 +310,7 @@ abstract class _Km2&Object&Am2 extends core::O } class Km2 extends self::_Km2&Object&Am2 { synthetic constructor •() → self::Km2 - : super core::Object::•() + : super self::_Km2&Object&Am2::•() ; } abstract class _Lm2&Object&Am2 extends core::Object implements self::Am2<() → (() → core::Function) → dynamic, self::_Lm2&Object&Am2::Z> { @@ -320,7 +320,7 @@ abstract class _Lm2&Object&Am2 extends core::O } class Lm2 extends self::_Lm2&Object&Am2 { synthetic constructor •() → self::Lm2 - : super core::Object::•() + : super self::_Lm2&Object&Am2::•() ; } class Mm2 extends core::Object implements self::Am2<(core::int) → dynamic, self::Mm2::Z> { @@ -390,7 +390,7 @@ abstract class _Bm3&Object&Am3 extends core::O } class Bm3 extends self::_Bm3&Object&Am3 { synthetic constructor •() → self::Bm3 - : super core::Object::•() + : super self::_Bm3&Object&Am3::•() ; } abstract class _Cm3&Object&Am3 extends core::Object implements self::Am3<(core::int) → dynamic, self::_Cm3&Object&Am3::Z> { @@ -400,7 +400,7 @@ abstract class _Cm3&Object&Am3 extends core::O } class Cm3 extends self::_Cm3&Object&Am3 { synthetic constructor •() → self::Cm3 - : super core::Object::•() + : super self::_Cm3&Object&Am3::•() ; } abstract class _Dm3&Object&Am3 extends core::Object implements self::Am3<() → core::int, self::_Dm3&Object&Am3::Z> { @@ -410,7 +410,7 @@ abstract class _Dm3&Object&Am3 extends core::O } class Dm3 extends self::_Dm3&Object&Am3 { synthetic constructor •() → self::Dm3 - : super core::Object::•() + : super self::_Dm3&Object&Am3::•() ; } abstract class _Em3&Object&Am3 extends core::Object implements self::Am3<() → dynamic, self::_Em3&Object&Am3::Z> { @@ -420,7 +420,7 @@ abstract class _Em3&Object&Am3 extends core::O } class Em3 extends self::_Em3&Object&Am3 { synthetic constructor •() → self::Em3 - : super core::Object::•() + : super self::_Em3&Object&Am3::•() ; } abstract class _Fm3&Object&Am3 extends core::Object implements self::Am3<() → dynamic, self::_Fm3&Object&Am3::Z> { @@ -430,7 +430,7 @@ abstract class _Fm3&Object&Am3 extends core::O } class Fm3 extends self::_Fm3&Object&Am3 { synthetic constructor •() → self::Fm3 - : super core::Object::•() + : super self::_Fm3&Object&Am3::•() ; } abstract class _Gm3&Object&Am3 extends core::Object implements self::Am3<({x: core::int}) → dynamic, self::_Gm3&Object&Am3::Z> { @@ -440,7 +440,7 @@ abstract class _Gm3&Object&Am3 extends core::O } class Gm3 extends self::_Gm3&Object&Am3 { synthetic constructor •() → self::Gm3 - : super core::Object::•() + : super self::_Gm3&Object&Am3::•() ; } abstract class _Hm3&Object&Am3 extends core::Object implements self::Am3<([core::int]) → dynamic, self::_Hm3&Object&Am3::Z> { @@ -450,7 +450,7 @@ abstract class _Hm3&Object&Am3 extends core::O } class Hm3 extends self::_Hm3&Object&Am3 { synthetic constructor •() → self::Hm3 - : super core::Object::•() + : super self::_Hm3&Object&Am3::•() ; } abstract class _Im3&Object&Am3 extends core::Object implements self::Am3<([core::int]) → dynamic, self::_Im3&Object&Am3::Z> { @@ -460,7 +460,7 @@ abstract class _Im3&Object&Am3 extends core::O } class Im3 extends self::_Im3&Object&Am3 { synthetic constructor •() → self::Im3 - : super core::Object::•() + : super self::_Im3&Object&Am3::•() ; } abstract class _Jm3&Object&Am3 extends core::Object implements self::Am3<(core::Function) → dynamic, self::_Jm3&Object&Am3::Z> { @@ -470,7 +470,7 @@ abstract class _Jm3&Object&Am3 extends core::O } class Jm3 extends self::_Jm3&Object&Am3 { synthetic constructor •() → self::Jm3 - : super core::Object::•() + : super self::_Jm3&Object&Am3::•() ; } abstract class _Km3&Object&Am3 extends core::Object implements self::Am3<() → (() → core::Function) → dynamic, self::_Km3&Object&Am3::Z> { @@ -480,7 +480,7 @@ abstract class _Km3&Object&Am3 extends core::O } class Km3 extends self::_Km3&Object&Am3 { synthetic constructor •() → self::Km3 - : super core::Object::•() + : super self::_Km3&Object&Am3::•() ; } class Af1 extends core::Object { diff --git a/pkg/front_end/testcases/clone_function_type.dart.strong.expect b/pkg/front_end/testcases/clone_function_type.dart.strong.expect index ae0741e8595..5b19c6c18b2 100644 --- a/pkg/front_end/testcases/clone_function_type.dart.strong.expect +++ b/pkg/front_end/testcases/clone_function_type.dart.strong.expect @@ -188,7 +188,7 @@ abstract class _Bm1&Object&Am1 = core::Object } class Bm1 extends self::_Bm1&Object&Am1 { synthetic constructor •() → self::Bm1 - : super core::Object::•() + : super self::_Bm1&Object&Am1::•() ; } abstract class _Cm1&Object&Am1 = core::Object with self::Am1<(core::int) → dynamic, self::_Cm1&Object&Am1::Z> { @@ -198,7 +198,7 @@ abstract class _Cm1&Object&Am1 = core::Object } class Cm1 extends self::_Cm1&Object&Am1 { synthetic constructor •() → self::Cm1 - : super core::Object::•() + : super self::_Cm1&Object&Am1::•() ; } abstract class _Dm1&Object&Am1 = core::Object with self::Am1<() → core::int, self::_Dm1&Object&Am1::Z> { @@ -208,7 +208,7 @@ abstract class _Dm1&Object&Am1 = core::Object } class Dm1 extends self::_Dm1&Object&Am1 { synthetic constructor •() → self::Dm1 - : super core::Object::•() + : super self::_Dm1&Object&Am1::•() ; } abstract class _Em1&Object&Am1 = core::Object with self::Am1<() → dynamic, self::_Em1&Object&Am1::Z> { @@ -218,7 +218,7 @@ abstract class _Em1&Object&Am1 = core::Object } class Em1 extends self::_Em1&Object&Am1 { synthetic constructor •() → self::Em1 - : super core::Object::•() + : super self::_Em1&Object&Am1::•() ; } abstract class _Fm1&Object&Am1 = core::Object with self::Am1<() → dynamic, self::_Fm1&Object&Am1::Z> { @@ -228,7 +228,7 @@ abstract class _Fm1&Object&Am1 = core::Object } class Fm1 extends self::_Fm1&Object&Am1 { synthetic constructor •() → self::Fm1 - : super core::Object::•() + : super self::_Fm1&Object&Am1::•() ; } abstract class _Gm1&Object&Am1 = core::Object with self::Am1<({x: core::int}) → dynamic, self::_Gm1&Object&Am1::Z> { @@ -238,7 +238,7 @@ abstract class _Gm1&Object&Am1 = core::Object } class Gm1 extends self::_Gm1&Object&Am1 { synthetic constructor •() → self::Gm1 - : super core::Object::•() + : super self::_Gm1&Object&Am1::•() ; } abstract class _Hm1&Object&Am1 = core::Object with self::Am1<([core::int]) → dynamic, self::_Hm1&Object&Am1::Z> { @@ -248,7 +248,7 @@ abstract class _Hm1&Object&Am1 = core::Object } class Hm1 extends self::_Hm1&Object&Am1 { synthetic constructor •() → self::Hm1 - : super core::Object::•() + : super self::_Hm1&Object&Am1::•() ; } abstract class _Im1&Object&Am1 = core::Object with self::Am1<([core::int]) → dynamic, self::_Im1&Object&Am1::Z> { @@ -258,7 +258,7 @@ abstract class _Im1&Object&Am1 = core::Object } class Im1 extends self::_Im1&Object&Am1 { synthetic constructor •() → self::Im1 - : super core::Object::•() + : super self::_Im1&Object&Am1::•() ; } abstract class _Jm1&Object&Am1 = core::Object with self::Am1 { @@ -268,7 +268,7 @@ abstract class _Jm1&Object&Am1 = core::Object } class Jm1 extends self::_Jm1&Object&Am1 { synthetic constructor •() → self::Jm1 - : super core::Object::•() + : super self::_Jm1&Object&Am1::•() ; } abstract class _Km1&Object&Am1 = core::Object with self::Am1<(core::Function) → dynamic, self::_Km1&Object&Am1::Z> { @@ -278,7 +278,7 @@ abstract class _Km1&Object&Am1 = core::Object } class Km1 extends self::_Km1&Object&Am1 { synthetic constructor •() → self::Km1 - : super core::Object::•() + : super self::_Km1&Object&Am1::•() ; } abstract class _Lm1&Object&Am1 = core::Object with self::Am1<() → (() → core::Function) → dynamic, self::_Lm1&Object&Am1::Z> { @@ -288,7 +288,7 @@ abstract class _Lm1&Object&Am1 = core::Object } class Lm1 extends self::_Lm1&Object&Am1 { synthetic constructor •() → self::Lm1 - : super core::Object::•() + : super self::_Lm1&Object&Am1::•() ; } class Mm1 = core::Object with self::Am1<(core::int) → dynamic, self::Mm1::Z> { @@ -358,7 +358,7 @@ abstract class _Bm2&Object&Am2 = core::Object } class Bm2 extends self::_Bm2&Object&Am2 { synthetic constructor •() → self::Bm2 - : super core::Object::•() + : super self::_Bm2&Object&Am2::•() ; } abstract class _Cm2&Object&Am2 = core::Object with self::Am2<(core::int) → dynamic, self::_Cm2&Object&Am2::Z> { @@ -368,7 +368,7 @@ abstract class _Cm2&Object&Am2 = core::Object } class Cm2 extends self::_Cm2&Object&Am2 { synthetic constructor •() → self::Cm2 - : super core::Object::•() + : super self::_Cm2&Object&Am2::•() ; } abstract class _Dm2&Object&Am2 = core::Object with self::Am2<() → core::int, self::_Dm2&Object&Am2::Z> { @@ -378,7 +378,7 @@ abstract class _Dm2&Object&Am2 = core::Object } class Dm2 extends self::_Dm2&Object&Am2 { synthetic constructor •() → self::Dm2 - : super core::Object::•() + : super self::_Dm2&Object&Am2::•() ; } abstract class _Em2&Object&Am2 = core::Object with self::Am2<() → dynamic, self::_Em2&Object&Am2::Z> { @@ -388,7 +388,7 @@ abstract class _Em2&Object&Am2 = core::Object } class Em2 extends self::_Em2&Object&Am2 { synthetic constructor •() → self::Em2 - : super core::Object::•() + : super self::_Em2&Object&Am2::•() ; } abstract class _Fm2&Object&Am2 = core::Object with self::Am2<() → dynamic, self::_Fm2&Object&Am2::Z> { @@ -398,7 +398,7 @@ abstract class _Fm2&Object&Am2 = core::Object } class Fm2 extends self::_Fm2&Object&Am2 { synthetic constructor •() → self::Fm2 - : super core::Object::•() + : super self::_Fm2&Object&Am2::•() ; } abstract class _Gm2&Object&Am2 = core::Object with self::Am2<({x: core::int}) → dynamic, self::_Gm2&Object&Am2::Z> { @@ -408,7 +408,7 @@ abstract class _Gm2&Object&Am2 = core::Object } class Gm2 extends self::_Gm2&Object&Am2 { synthetic constructor •() → self::Gm2 - : super core::Object::•() + : super self::_Gm2&Object&Am2::•() ; } abstract class _Hm2&Object&Am2 = core::Object with self::Am2<([core::int]) → dynamic, self::_Hm2&Object&Am2::Z> { @@ -418,7 +418,7 @@ abstract class _Hm2&Object&Am2 = core::Object } class Hm2 extends self::_Hm2&Object&Am2 { synthetic constructor •() → self::Hm2 - : super core::Object::•() + : super self::_Hm2&Object&Am2::•() ; } abstract class _Im2&Object&Am2 = core::Object with self::Am2<([core::int]) → dynamic, self::_Im2&Object&Am2::Z> { @@ -428,7 +428,7 @@ abstract class _Im2&Object&Am2 = core::Object } class Im2 extends self::_Im2&Object&Am2 { synthetic constructor •() → self::Im2 - : super core::Object::•() + : super self::_Im2&Object&Am2::•() ; } abstract class _Jm2&Object&Am2 = core::Object with self::Am2 { @@ -438,7 +438,7 @@ abstract class _Jm2&Object&Am2 = core::Object } class Jm2 extends self::_Jm2&Object&Am2 { synthetic constructor •() → self::Jm2 - : super core::Object::•() + : super self::_Jm2&Object&Am2::•() ; } abstract class _Km2&Object&Am2 = core::Object with self::Am2<(core::Function) → dynamic, self::_Km2&Object&Am2::Z> { @@ -448,7 +448,7 @@ abstract class _Km2&Object&Am2 = core::Object } class Km2 extends self::_Km2&Object&Am2 { synthetic constructor •() → self::Km2 - : super core::Object::•() + : super self::_Km2&Object&Am2::•() ; } abstract class _Lm2&Object&Am2 = core::Object with self::Am2<() → (() → core::Function) → dynamic, self::_Lm2&Object&Am2::Z> { @@ -458,7 +458,7 @@ abstract class _Lm2&Object&Am2 = core::Object } class Lm2 extends self::_Lm2&Object&Am2 { synthetic constructor •() → self::Lm2 - : super core::Object::•() + : super self::_Lm2&Object&Am2::•() ; } class Mm2 = core::Object with self::Am2<(core::int) → dynamic, self::Mm2::Z> { @@ -528,7 +528,7 @@ abstract class _Bm3&Object&Am3 = core::Object } class Bm3 extends self::_Bm3&Object&Am3 { synthetic constructor •() → self::Bm3 - : super core::Object::•() + : super self::_Bm3&Object&Am3::•() ; } abstract class _Cm3&Object&Am3 = core::Object with self::Am3<(core::int) → dynamic, self::_Cm3&Object&Am3::Z> { @@ -538,7 +538,7 @@ abstract class _Cm3&Object&Am3 = core::Object } class Cm3 extends self::_Cm3&Object&Am3 { synthetic constructor •() → self::Cm3 - : super core::Object::•() + : super self::_Cm3&Object&Am3::•() ; } abstract class _Dm3&Object&Am3 = core::Object with self::Am3<() → core::int, self::_Dm3&Object&Am3::Z> { @@ -548,7 +548,7 @@ abstract class _Dm3&Object&Am3 = core::Object } class Dm3 extends self::_Dm3&Object&Am3 { synthetic constructor •() → self::Dm3 - : super core::Object::•() + : super self::_Dm3&Object&Am3::•() ; } abstract class _Em3&Object&Am3 = core::Object with self::Am3<() → dynamic, self::_Em3&Object&Am3::Z> { @@ -558,7 +558,7 @@ abstract class _Em3&Object&Am3 = core::Object } class Em3 extends self::_Em3&Object&Am3 { synthetic constructor •() → self::Em3 - : super core::Object::•() + : super self::_Em3&Object&Am3::•() ; } abstract class _Fm3&Object&Am3 = core::Object with self::Am3<() → dynamic, self::_Fm3&Object&Am3::Z> { @@ -568,7 +568,7 @@ abstract class _Fm3&Object&Am3 = core::Object } class Fm3 extends self::_Fm3&Object&Am3 { synthetic constructor •() → self::Fm3 - : super core::Object::•() + : super self::_Fm3&Object&Am3::•() ; } abstract class _Gm3&Object&Am3 = core::Object with self::Am3<({x: core::int}) → dynamic, self::_Gm3&Object&Am3::Z> { @@ -578,7 +578,7 @@ abstract class _Gm3&Object&Am3 = core::Object } class Gm3 extends self::_Gm3&Object&Am3 { synthetic constructor •() → self::Gm3 - : super core::Object::•() + : super self::_Gm3&Object&Am3::•() ; } abstract class _Hm3&Object&Am3 = core::Object with self::Am3<([core::int]) → dynamic, self::_Hm3&Object&Am3::Z> { @@ -588,7 +588,7 @@ abstract class _Hm3&Object&Am3 = core::Object } class Hm3 extends self::_Hm3&Object&Am3 { synthetic constructor •() → self::Hm3 - : super core::Object::•() + : super self::_Hm3&Object&Am3::•() ; } abstract class _Im3&Object&Am3 = core::Object with self::Am3<([core::int]) → dynamic, self::_Im3&Object&Am3::Z> { @@ -598,7 +598,7 @@ abstract class _Im3&Object&Am3 = core::Object } class Im3 extends self::_Im3&Object&Am3 { synthetic constructor •() → self::Im3 - : super core::Object::•() + : super self::_Im3&Object&Am3::•() ; } abstract class _Jm3&Object&Am3 = core::Object with self::Am3<(core::Function) → dynamic, self::_Jm3&Object&Am3::Z> { @@ -608,7 +608,7 @@ abstract class _Jm3&Object&Am3 = core::Object } class Jm3 extends self::_Jm3&Object&Am3 { synthetic constructor •() → self::Jm3 - : super core::Object::•() + : super self::_Jm3&Object&Am3::•() ; } abstract class _Km3&Object&Am3 = core::Object with self::Am3<() → (() → core::Function) → dynamic, self::_Km3&Object&Am3::Z> { @@ -618,7 +618,7 @@ abstract class _Km3&Object&Am3 = core::Object } class Km3 extends self::_Km3&Object&Am3 { synthetic constructor •() → self::Km3 - : super core::Object::•() + : super self::_Km3&Object&Am3::•() ; } class Af1 extends core::Object { diff --git a/pkg/front_end/testcases/clone_function_type.dart.strong.transformed.expect b/pkg/front_end/testcases/clone_function_type.dart.strong.transformed.expect index 22d08e54c65..78889cf0f1e 100644 --- a/pkg/front_end/testcases/clone_function_type.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/clone_function_type.dart.strong.transformed.expect @@ -94,7 +94,7 @@ abstract class _Bm1&Object&Am1 extends core::O } class Bm1 extends self::_Bm1&Object&Am1 { synthetic constructor •() → self::Bm1 - : super core::Object::•() + : super self::_Bm1&Object&Am1::•() ; } abstract class _Cm1&Object&Am1 extends core::Object implements self::Am1<(core::int) → dynamic, self::_Cm1&Object&Am1::Z> { @@ -104,7 +104,7 @@ abstract class _Cm1&Object&Am1 extends core::O } class Cm1 extends self::_Cm1&Object&Am1 { synthetic constructor •() → self::Cm1 - : super core::Object::•() + : super self::_Cm1&Object&Am1::•() ; } abstract class _Dm1&Object&Am1 extends core::Object implements self::Am1<() → core::int, self::_Dm1&Object&Am1::Z> { @@ -114,7 +114,7 @@ abstract class _Dm1&Object&Am1 extends core::O } class Dm1 extends self::_Dm1&Object&Am1 { synthetic constructor •() → self::Dm1 - : super core::Object::•() + : super self::_Dm1&Object&Am1::•() ; } abstract class _Em1&Object&Am1 extends core::Object implements self::Am1<() → dynamic, self::_Em1&Object&Am1::Z> { @@ -124,7 +124,7 @@ abstract class _Em1&Object&Am1 extends core::O } class Em1 extends self::_Em1&Object&Am1 { synthetic constructor •() → self::Em1 - : super core::Object::•() + : super self::_Em1&Object&Am1::•() ; } abstract class _Fm1&Object&Am1 extends core::Object implements self::Am1<() → dynamic, self::_Fm1&Object&Am1::Z> { @@ -134,7 +134,7 @@ abstract class _Fm1&Object&Am1 extends core::O } class Fm1 extends self::_Fm1&Object&Am1 { synthetic constructor •() → self::Fm1 - : super core::Object::•() + : super self::_Fm1&Object&Am1::•() ; } abstract class _Gm1&Object&Am1 extends core::Object implements self::Am1<({x: core::int}) → dynamic, self::_Gm1&Object&Am1::Z> { @@ -144,7 +144,7 @@ abstract class _Gm1&Object&Am1 extends core::O } class Gm1 extends self::_Gm1&Object&Am1 { synthetic constructor •() → self::Gm1 - : super core::Object::•() + : super self::_Gm1&Object&Am1::•() ; } abstract class _Hm1&Object&Am1 extends core::Object implements self::Am1<([core::int]) → dynamic, self::_Hm1&Object&Am1::Z> { @@ -154,7 +154,7 @@ abstract class _Hm1&Object&Am1 extends core::O } class Hm1 extends self::_Hm1&Object&Am1 { synthetic constructor •() → self::Hm1 - : super core::Object::•() + : super self::_Hm1&Object&Am1::•() ; } abstract class _Im1&Object&Am1 extends core::Object implements self::Am1<([core::int]) → dynamic, self::_Im1&Object&Am1::Z> { @@ -164,7 +164,7 @@ abstract class _Im1&Object&Am1 extends core::O } class Im1 extends self::_Im1&Object&Am1 { synthetic constructor •() → self::Im1 - : super core::Object::•() + : super self::_Im1&Object&Am1::•() ; } abstract class _Jm1&Object&Am1 extends core::Object implements self::Am1 { @@ -174,7 +174,7 @@ abstract class _Jm1&Object&Am1 extends core::O } class Jm1 extends self::_Jm1&Object&Am1 { synthetic constructor •() → self::Jm1 - : super core::Object::•() + : super self::_Jm1&Object&Am1::•() ; } abstract class _Km1&Object&Am1 extends core::Object implements self::Am1<(core::Function) → dynamic, self::_Km1&Object&Am1::Z> { @@ -184,7 +184,7 @@ abstract class _Km1&Object&Am1 extends core::O } class Km1 extends self::_Km1&Object&Am1 { synthetic constructor •() → self::Km1 - : super core::Object::•() + : super self::_Km1&Object&Am1::•() ; } abstract class _Lm1&Object&Am1 extends core::Object implements self::Am1<() → (() → core::Function) → dynamic, self::_Lm1&Object&Am1::Z> { @@ -194,7 +194,7 @@ abstract class _Lm1&Object&Am1 extends core::O } class Lm1 extends self::_Lm1&Object&Am1 { synthetic constructor •() → self::Lm1 - : super core::Object::•() + : super self::_Lm1&Object&Am1::•() ; } class Mm1 extends core::Object implements self::Am1<(core::int) → dynamic, self::Mm1::Z> { @@ -264,7 +264,7 @@ abstract class _Bm2&Object&Am2 extends core::O } class Bm2 extends self::_Bm2&Object&Am2 { synthetic constructor •() → self::Bm2 - : super core::Object::•() + : super self::_Bm2&Object&Am2::•() ; } abstract class _Cm2&Object&Am2 extends core::Object implements self::Am2<(core::int) → dynamic, self::_Cm2&Object&Am2::Z> { @@ -274,7 +274,7 @@ abstract class _Cm2&Object&Am2 extends core::O } class Cm2 extends self::_Cm2&Object&Am2 { synthetic constructor •() → self::Cm2 - : super core::Object::•() + : super self::_Cm2&Object&Am2::•() ; } abstract class _Dm2&Object&Am2 extends core::Object implements self::Am2<() → core::int, self::_Dm2&Object&Am2::Z> { @@ -284,7 +284,7 @@ abstract class _Dm2&Object&Am2 extends core::O } class Dm2 extends self::_Dm2&Object&Am2 { synthetic constructor •() → self::Dm2 - : super core::Object::•() + : super self::_Dm2&Object&Am2::•() ; } abstract class _Em2&Object&Am2 extends core::Object implements self::Am2<() → dynamic, self::_Em2&Object&Am2::Z> { @@ -294,7 +294,7 @@ abstract class _Em2&Object&Am2 extends core::O } class Em2 extends self::_Em2&Object&Am2 { synthetic constructor •() → self::Em2 - : super core::Object::•() + : super self::_Em2&Object&Am2::•() ; } abstract class _Fm2&Object&Am2 extends core::Object implements self::Am2<() → dynamic, self::_Fm2&Object&Am2::Z> { @@ -304,7 +304,7 @@ abstract class _Fm2&Object&Am2 extends core::O } class Fm2 extends self::_Fm2&Object&Am2 { synthetic constructor •() → self::Fm2 - : super core::Object::•() + : super self::_Fm2&Object&Am2::•() ; } abstract class _Gm2&Object&Am2 extends core::Object implements self::Am2<({x: core::int}) → dynamic, self::_Gm2&Object&Am2::Z> { @@ -314,7 +314,7 @@ abstract class _Gm2&Object&Am2 extends core::O } class Gm2 extends self::_Gm2&Object&Am2 { synthetic constructor •() → self::Gm2 - : super core::Object::•() + : super self::_Gm2&Object&Am2::•() ; } abstract class _Hm2&Object&Am2 extends core::Object implements self::Am2<([core::int]) → dynamic, self::_Hm2&Object&Am2::Z> { @@ -324,7 +324,7 @@ abstract class _Hm2&Object&Am2 extends core::O } class Hm2 extends self::_Hm2&Object&Am2 { synthetic constructor •() → self::Hm2 - : super core::Object::•() + : super self::_Hm2&Object&Am2::•() ; } abstract class _Im2&Object&Am2 extends core::Object implements self::Am2<([core::int]) → dynamic, self::_Im2&Object&Am2::Z> { @@ -334,7 +334,7 @@ abstract class _Im2&Object&Am2 extends core::O } class Im2 extends self::_Im2&Object&Am2 { synthetic constructor •() → self::Im2 - : super core::Object::•() + : super self::_Im2&Object&Am2::•() ; } abstract class _Jm2&Object&Am2 extends core::Object implements self::Am2 { @@ -344,7 +344,7 @@ abstract class _Jm2&Object&Am2 extends core::O } class Jm2 extends self::_Jm2&Object&Am2 { synthetic constructor •() → self::Jm2 - : super core::Object::•() + : super self::_Jm2&Object&Am2::•() ; } abstract class _Km2&Object&Am2 extends core::Object implements self::Am2<(core::Function) → dynamic, self::_Km2&Object&Am2::Z> { @@ -354,7 +354,7 @@ abstract class _Km2&Object&Am2 extends core::O } class Km2 extends self::_Km2&Object&Am2 { synthetic constructor •() → self::Km2 - : super core::Object::•() + : super self::_Km2&Object&Am2::•() ; } abstract class _Lm2&Object&Am2 extends core::Object implements self::Am2<() → (() → core::Function) → dynamic, self::_Lm2&Object&Am2::Z> { @@ -364,7 +364,7 @@ abstract class _Lm2&Object&Am2 extends core::O } class Lm2 extends self::_Lm2&Object&Am2 { synthetic constructor •() → self::Lm2 - : super core::Object::•() + : super self::_Lm2&Object&Am2::•() ; } class Mm2 extends core::Object implements self::Am2<(core::int) → dynamic, self::Mm2::Z> { @@ -434,7 +434,7 @@ abstract class _Bm3&Object&Am3 extends core::O } class Bm3 extends self::_Bm3&Object&Am3 { synthetic constructor •() → self::Bm3 - : super core::Object::•() + : super self::_Bm3&Object&Am3::•() ; } abstract class _Cm3&Object&Am3 extends core::Object implements self::Am3<(core::int) → dynamic, self::_Cm3&Object&Am3::Z> { @@ -444,7 +444,7 @@ abstract class _Cm3&Object&Am3 extends core::O } class Cm3 extends self::_Cm3&Object&Am3 { synthetic constructor •() → self::Cm3 - : super core::Object::•() + : super self::_Cm3&Object&Am3::•() ; } abstract class _Dm3&Object&Am3 extends core::Object implements self::Am3<() → core::int, self::_Dm3&Object&Am3::Z> { @@ -454,7 +454,7 @@ abstract class _Dm3&Object&Am3 extends core::O } class Dm3 extends self::_Dm3&Object&Am3 { synthetic constructor •() → self::Dm3 - : super core::Object::•() + : super self::_Dm3&Object&Am3::•() ; } abstract class _Em3&Object&Am3 extends core::Object implements self::Am3<() → dynamic, self::_Em3&Object&Am3::Z> { @@ -464,7 +464,7 @@ abstract class _Em3&Object&Am3 extends core::O } class Em3 extends self::_Em3&Object&Am3 { synthetic constructor •() → self::Em3 - : super core::Object::•() + : super self::_Em3&Object&Am3::•() ; } abstract class _Fm3&Object&Am3 extends core::Object implements self::Am3<() → dynamic, self::_Fm3&Object&Am3::Z> { @@ -474,7 +474,7 @@ abstract class _Fm3&Object&Am3 extends core::O } class Fm3 extends self::_Fm3&Object&Am3 { synthetic constructor •() → self::Fm3 - : super core::Object::•() + : super self::_Fm3&Object&Am3::•() ; } abstract class _Gm3&Object&Am3 extends core::Object implements self::Am3<({x: core::int}) → dynamic, self::_Gm3&Object&Am3::Z> { @@ -484,7 +484,7 @@ abstract class _Gm3&Object&Am3 extends core::O } class Gm3 extends self::_Gm3&Object&Am3 { synthetic constructor •() → self::Gm3 - : super core::Object::•() + : super self::_Gm3&Object&Am3::•() ; } abstract class _Hm3&Object&Am3 extends core::Object implements self::Am3<([core::int]) → dynamic, self::_Hm3&Object&Am3::Z> { @@ -494,7 +494,7 @@ abstract class _Hm3&Object&Am3 extends core::O } class Hm3 extends self::_Hm3&Object&Am3 { synthetic constructor •() → self::Hm3 - : super core::Object::•() + : super self::_Hm3&Object&Am3::•() ; } abstract class _Im3&Object&Am3 extends core::Object implements self::Am3<([core::int]) → dynamic, self::_Im3&Object&Am3::Z> { @@ -504,7 +504,7 @@ abstract class _Im3&Object&Am3 extends core::O } class Im3 extends self::_Im3&Object&Am3 { synthetic constructor •() → self::Im3 - : super core::Object::•() + : super self::_Im3&Object&Am3::•() ; } abstract class _Jm3&Object&Am3 extends core::Object implements self::Am3<(core::Function) → dynamic, self::_Jm3&Object&Am3::Z> { @@ -514,7 +514,7 @@ abstract class _Jm3&Object&Am3 extends core::O } class Jm3 extends self::_Jm3&Object&Am3 { synthetic constructor •() → self::Jm3 - : super core::Object::•() + : super self::_Jm3&Object&Am3::•() ; } abstract class _Km3&Object&Am3 extends core::Object implements self::Am3<() → (() → core::Function) → dynamic, self::_Km3&Object&Am3::Z> { @@ -524,7 +524,7 @@ abstract class _Km3&Object&Am3 extends core::O } class Km3 extends self::_Km3&Object&Am3 { synthetic constructor •() → self::Km3 - : super core::Object::•() + : super self::_Km3&Object&Am3::•() ; } class Af1 extends core::Object { diff --git a/pkg/front_end/testcases/inference/infer_field_overrides_getter.dart.legacy.expect b/pkg/front_end/testcases/inference/infer_field_overrides_getter.dart.legacy.expect index cb3988fd1d7..bd70fa06835 100644 --- a/pkg/front_end/testcases/inference/infer_field_overrides_getter.dart.legacy.expect +++ b/pkg/front_end/testcases/inference/infer_field_overrides_getter.dart.legacy.expect @@ -47,7 +47,7 @@ abstract class _G&Object&B = core::Object with self::B { class G extends self::_G&Object&B { field dynamic x = null; synthetic constructor •() → self::G - : super core::Object::•() + : super self::_G&Object&B::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference/infer_field_overrides_getter.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/infer_field_overrides_getter.dart.legacy.transformed.expect index c1822ed043f..e3ffc47150f 100644 --- a/pkg/front_end/testcases/inference/infer_field_overrides_getter.dart.legacy.transformed.expect +++ b/pkg/front_end/testcases/inference/infer_field_overrides_getter.dart.legacy.transformed.expect @@ -49,7 +49,7 @@ abstract class _G&Object&B extends core::Object implements self::B { class G extends self::_G&Object&B { field dynamic x = null; synthetic constructor •() → self::G - : super core::Object::•() + : super self::_G&Object&B::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference/infer_field_overrides_getter.dart.strong.expect b/pkg/front_end/testcases/inference/infer_field_overrides_getter.dart.strong.expect index fa8f9e81ed7..5c9403f8c6d 100644 --- a/pkg/front_end/testcases/inference/infer_field_overrides_getter.dart.strong.expect +++ b/pkg/front_end/testcases/inference/infer_field_overrides_getter.dart.strong.expect @@ -47,7 +47,7 @@ abstract class _G&Object&B = core::Object with self::B { class G extends self::_G&Object&B { field core::int x = null; synthetic constructor •() → self::G - : super core::Object::•() + : super self::_G&Object&B::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference/infer_field_overrides_getter.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/infer_field_overrides_getter.dart.strong.transformed.expect index 427dbc24f83..10315d8f905 100644 --- a/pkg/front_end/testcases/inference/infer_field_overrides_getter.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/inference/infer_field_overrides_getter.dart.strong.transformed.expect @@ -49,7 +49,7 @@ abstract class _G&Object&B extends core::Object implements self::B { class G extends self::_G&Object&B { field core::int x = null; synthetic constructor •() → self::G - : super core::Object::•() + : super self::_G&Object&B::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference/infer_field_overrides_setter.dart.legacy.expect b/pkg/front_end/testcases/inference/infer_field_overrides_setter.dart.legacy.expect index 33c6ea78138..97bdc2087ee 100644 --- a/pkg/front_end/testcases/inference/infer_field_overrides_setter.dart.legacy.expect +++ b/pkg/front_end/testcases/inference/infer_field_overrides_setter.dart.legacy.expect @@ -46,7 +46,7 @@ abstract class _G&Object&B = core::Object with self::B { class G extends self::_G&Object&B { field dynamic x = null; synthetic constructor •() → self::G - : super core::Object::•() + : super self::_G&Object&B::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference/infer_field_overrides_setter.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/infer_field_overrides_setter.dart.legacy.transformed.expect index bf18d3fbeb2..a8ed4310496 100644 --- a/pkg/front_end/testcases/inference/infer_field_overrides_setter.dart.legacy.transformed.expect +++ b/pkg/front_end/testcases/inference/infer_field_overrides_setter.dart.legacy.transformed.expect @@ -47,7 +47,7 @@ abstract class _G&Object&B extends core::Object implements self::B { class G extends self::_G&Object&B { field dynamic x = null; synthetic constructor •() → self::G - : super core::Object::•() + : super self::_G&Object&B::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference/infer_field_overrides_setter.dart.strong.expect b/pkg/front_end/testcases/inference/infer_field_overrides_setter.dart.strong.expect index 2b77c7fc344..a2a01da5d99 100644 --- a/pkg/front_end/testcases/inference/infer_field_overrides_setter.dart.strong.expect +++ b/pkg/front_end/testcases/inference/infer_field_overrides_setter.dart.strong.expect @@ -46,7 +46,7 @@ abstract class _G&Object&B = core::Object with self::B { class G extends self::_G&Object&B { field core::int x = null; synthetic constructor •() → self::G - : super core::Object::•() + : super self::_G&Object&B::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference/infer_field_overrides_setter.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/infer_field_overrides_setter.dart.strong.transformed.expect index d81e50427de..8cf587d3fc0 100644 --- a/pkg/front_end/testcases/inference/infer_field_overrides_setter.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/inference/infer_field_overrides_setter.dart.strong.transformed.expect @@ -47,7 +47,7 @@ abstract class _G&Object&B extends core::Object implements self::B { class G extends self::_G&Object&B { field core::int x = null; synthetic constructor •() → self::G - : super core::Object::•() + : super self::_G&Object&B::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference/mixin_inference_instantiate_to_bounds_1.dart.legacy.expect b/pkg/front_end/testcases/inference/mixin_inference_instantiate_to_bounds_1.dart.legacy.expect index 18910bd90d7..68141d07e77 100644 --- a/pkg/front_end/testcases/inference/mixin_inference_instantiate_to_bounds_1.dart.legacy.expect +++ b/pkg/front_end/testcases/inference/mixin_inference_instantiate_to_bounds_1.dart.legacy.expect @@ -48,7 +48,7 @@ abstract class _A&M1&M0 = self::M1 with self::M0 { } class A extends self::_A&M1&M0 { synthetic constructor •() → self::A - : super self::M1::•() + : super self::_A&M1&M0::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference/mixin_inference_instantiate_to_bounds_1.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/mixin_inference_instantiate_to_bounds_1.dart.legacy.transformed.expect index aea6b534059..d53ce701c44 100644 --- a/pkg/front_end/testcases/inference/mixin_inference_instantiate_to_bounds_1.dart.legacy.transformed.expect +++ b/pkg/front_end/testcases/inference/mixin_inference_instantiate_to_bounds_1.dart.legacy.transformed.expect @@ -36,7 +36,7 @@ abstract class _A&M1&M0 extends self::M1 implements self::M0 { } class A extends self::_A&M1&M0 { synthetic constructor •() → self::A - : super self::M1::•() + : super self::_A&M1&M0::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference/mixin_inference_instantiate_to_bounds_1.dart.strong.expect b/pkg/front_end/testcases/inference/mixin_inference_instantiate_to_bounds_1.dart.strong.expect index 1faa3db06ab..bfb7b013359 100644 --- a/pkg/front_end/testcases/inference/mixin_inference_instantiate_to_bounds_1.dart.strong.expect +++ b/pkg/front_end/testcases/inference/mixin_inference_instantiate_to_bounds_1.dart.strong.expect @@ -24,7 +24,7 @@ abstract class _A&M1&M0 = self::M1 with self::M0 { } class A extends self::_A&M1&M0 { synthetic constructor •() → self::A - : super self::M1::•() + : super self::_A&M1&M0::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference/mixin_inference_instantiate_to_bounds_1.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/mixin_inference_instantiate_to_bounds_1.dart.strong.transformed.expect index 7a5e6b5a201..dfd7d1ed2c2 100644 --- a/pkg/front_end/testcases/inference/mixin_inference_instantiate_to_bounds_1.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/inference/mixin_inference_instantiate_to_bounds_1.dart.strong.transformed.expect @@ -24,7 +24,7 @@ abstract class _A&M1&M0 extends self::M1 implements self::M0 { } class A extends self::_A&M1&M0 { synthetic constructor •() → self::A - : super self::M1::•() + : super self::_A&M1&M0::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference/mixin_inference_instantiate_to_bounds_2.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/mixin_inference_instantiate_to_bounds_2.dart.legacy.transformed.expect index fa200279083..353900f44ef 100644 --- a/pkg/front_end/testcases/inference/mixin_inference_instantiate_to_bounds_2.dart.legacy.transformed.expect +++ b/pkg/front_end/testcases/inference/mixin_inference_instantiate_to_bounds_2.dart.legacy.transformed.expect @@ -36,7 +36,7 @@ abstract class _A&M1&M0 extends self::M1 implements self::M0 { } class A extends self::_A&M1&M0 { synthetic constructor •() → self::A - : super self::M1::•() + : super self::_A&M1&M0::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference/mixin_inference_instantiate_to_bounds_2.dart.strong.expect b/pkg/front_end/testcases/inference/mixin_inference_instantiate_to_bounds_2.dart.strong.expect index 69818cabb4e..db552eeb10b 100644 --- a/pkg/front_end/testcases/inference/mixin_inference_instantiate_to_bounds_2.dart.strong.expect +++ b/pkg/front_end/testcases/inference/mixin_inference_instantiate_to_bounds_2.dart.strong.expect @@ -24,7 +24,7 @@ abstract class _A&M1&M0 = self::M1 with self::M0 { } class A extends self::_A&M1&M0 { synthetic constructor •() → self::A - : super self::M1::•() + : super self::_A&M1&M0::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference/mixin_inference_instantiate_to_bounds_2.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/mixin_inference_instantiate_to_bounds_2.dart.strong.transformed.expect index 8e64db99a2d..6459244b019 100644 --- a/pkg/front_end/testcases/inference/mixin_inference_instantiate_to_bounds_2.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/inference/mixin_inference_instantiate_to_bounds_2.dart.strong.transformed.expect @@ -24,7 +24,7 @@ abstract class _A&M1&M0 extends self::M1 implements self::M0 { } class A extends self::_A&M1&M0 { synthetic constructor •() → self::A - : super self::M1::•() + : super self::_A&M1&M0::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference/mixin_inference_instantiate_to_bounds_3.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/mixin_inference_instantiate_to_bounds_3.dart.legacy.transformed.expect index db8c3d41166..e98e8f6726e 100644 --- a/pkg/front_end/testcases/inference/mixin_inference_instantiate_to_bounds_3.dart.legacy.transformed.expect +++ b/pkg/front_end/testcases/inference/mixin_inference_instantiate_to_bounds_3.dart.legacy.transformed.expect @@ -36,7 +36,7 @@ abstract class _A&M1&M0 extends self::M1 implements self::M0 { } class A extends self::_A&M1&M0 { synthetic constructor •() → self::A - : super self::M1::•() + : super self::_A&M1&M0::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference/mixin_inference_instantiate_to_bounds_3.dart.strong.expect b/pkg/front_end/testcases/inference/mixin_inference_instantiate_to_bounds_3.dart.strong.expect index fb8fecdf073..7d0cb036852 100644 --- a/pkg/front_end/testcases/inference/mixin_inference_instantiate_to_bounds_3.dart.strong.expect +++ b/pkg/front_end/testcases/inference/mixin_inference_instantiate_to_bounds_3.dart.strong.expect @@ -43,7 +43,7 @@ abstract class _A&M1&M0 = self::M1 with self::M0 extends self::_M0&I&J { synthetic constructor •() → self::M0 - : super self::I::•() + : super self::_M0&I&J::•() ; } class M1 extends core::Object implements self::I { @@ -83,7 +83,7 @@ abstract class _A&M2&M0 = self::M2 with self::M0 { } class A extends self::_A&M2&M0 { synthetic constructor •() → self::A - : super self::M2::•() + : super self::_A&M2&M0::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference/mixin_inference_multiple_constraints.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/mixin_inference_multiple_constraints.dart.legacy.transformed.expect index b8d669d610d..ed908834557 100644 --- a/pkg/front_end/testcases/inference/mixin_inference_multiple_constraints.dart.legacy.transformed.expect +++ b/pkg/front_end/testcases/inference/mixin_inference_multiple_constraints.dart.legacy.transformed.expect @@ -41,7 +41,7 @@ abstract class _M0&I&J extends self::_M0&I&J { synthetic constructor •() → self::M0 - : super self::I::•() + : super self::_M0&I&J::•() ; } class M1 extends core::Object implements self::I { @@ -61,7 +61,7 @@ abstract class _A&M2&M0 extends self::M2 implements self::M0 { } class A extends self::_A&M2&M0 { synthetic constructor •() → self::A - : super self::M2::•() + : super self::_A&M2&M0::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference/mixin_inference_multiple_constraints.dart.strong.expect b/pkg/front_end/testcases/inference/mixin_inference_multiple_constraints.dart.strong.expect index 517eca67fe2..9fe7a0a23e7 100644 --- a/pkg/front_end/testcases/inference/mixin_inference_multiple_constraints.dart.strong.expect +++ b/pkg/front_end/testcases/inference/mixin_inference_multiple_constraints.dart.strong.expect @@ -19,7 +19,7 @@ abstract class _M0&I&J extends self::_M0&I&J { synthetic constructor •() → self::M0 - : super self::I::•() + : super self::_M0&I&J::•() ; } class M1 extends core::Object implements self::I { @@ -39,7 +39,7 @@ abstract class _A&M2&M0 = self::M2 with self::M0 { } class A extends self::_A&M2&M0 { synthetic constructor •() → self::A - : super self::M2::•() + : super self::_A&M2&M0::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference/mixin_inference_multiple_constraints.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/mixin_inference_multiple_constraints.dart.strong.transformed.expect index ac1a5bbf303..435ce3b3b96 100644 --- a/pkg/front_end/testcases/inference/mixin_inference_multiple_constraints.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/inference/mixin_inference_multiple_constraints.dart.strong.transformed.expect @@ -19,7 +19,7 @@ abstract class _M0&I&J extends self::_M0&I&J { synthetic constructor •() → self::M0 - : super self::I::•() + : super self::_M0&I&J::•() ; } class M1 extends core::Object implements self::I { @@ -39,7 +39,7 @@ abstract class _A&M2&M0 extends self::M2 implements self::M0 with self::M0 { } class A extends self::_A&M2&M0 { synthetic constructor •() → self::A - : super self::M2::•() + : super self::_A&M2&M0::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference/mixin_inference_non_trivial_constraints.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/mixin_inference_non_trivial_constraints.dart.legacy.transformed.expect index 4a624af65e5..41fb098ab57 100644 --- a/pkg/front_end/testcases/inference/mixin_inference_non_trivial_constraints.dart.legacy.transformed.expect +++ b/pkg/front_end/testcases/inference/mixin_inference_non_trivial_constraints.dart.legacy.transformed.expect @@ -45,7 +45,7 @@ abstract class _A&M2&M0 extends self::M2 implements self::M0 } class A extends self::_A&M2&M0 { synthetic constructor •() → self::A - : super self::M2::•() + : super self::_A&M2&M0::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference/mixin_inference_non_trivial_constraints.dart.strong.expect b/pkg/front_end/testcases/inference/mixin_inference_non_trivial_constraints.dart.strong.expect index 36da7e3c423..1030f6b5ae7 100644 --- a/pkg/front_end/testcases/inference/mixin_inference_non_trivial_constraints.dart.strong.expect +++ b/pkg/front_end/testcases/inference/mixin_inference_non_trivial_constraints.dart.strong.expect @@ -29,7 +29,7 @@ abstract class _A&M2&M0 = self::M2 with self::M0 implements self::M0 with self::M1 { } class A extends self::_A&M0&M1 { synthetic constructor •() → self::A - : super self::M0::•() + : super self::_A&M0&M1::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference/mixin_inference_outwards_1.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/mixin_inference_outwards_1.dart.legacy.transformed.expect index 8b45bc6f13d..7a1c8c26375 100644 --- a/pkg/front_end/testcases/inference/mixin_inference_outwards_1.dart.legacy.transformed.expect +++ b/pkg/front_end/testcases/inference/mixin_inference_outwards_1.dart.legacy.transformed.expect @@ -36,7 +36,7 @@ abstract class _A&M0&M1 extends self::M0 implements self::M1 } class A extends self::_A&M0&M1 { synthetic constructor •() → self::A - : super self::M0::•() + : super self::_A&M0&M1::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference/mixin_inference_outwards_1.dart.strong.expect b/pkg/front_end/testcases/inference/mixin_inference_outwards_1.dart.strong.expect index 128fa4aaaaa..b336c68d75b 100644 --- a/pkg/front_end/testcases/inference/mixin_inference_outwards_1.dart.strong.expect +++ b/pkg/front_end/testcases/inference/mixin_inference_outwards_1.dart.strong.expect @@ -24,7 +24,7 @@ abstract class _A&M0&M1 = self::M0 with self::M1 { } class A extends self::_A&M0&M1 { synthetic constructor •() → self::A - : super self::M0::•() + : super self::_A&M0&M1::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference/mixin_inference_outwards_1.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/mixin_inference_outwards_1.dart.strong.transformed.expect index ec46a1383e2..75ebf9d9fe2 100644 --- a/pkg/front_end/testcases/inference/mixin_inference_outwards_1.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/inference/mixin_inference_outwards_1.dart.strong.transformed.expect @@ -24,7 +24,7 @@ abstract class _A&M0&M1 extends self::M0 implements self::M1 { } class A extends self::_A&M0&M1&M2 { synthetic constructor •() → self::A - : super self::M0::•() + : super self::_A&M0&M1&M2::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference/mixin_inference_outwards_2.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/mixin_inference_outwards_2.dart.legacy.transformed.expect index 50753704095..6079249b999 100644 --- a/pkg/front_end/testcases/inference/mixin_inference_outwards_2.dart.legacy.transformed.expect +++ b/pkg/front_end/testcases/inference/mixin_inference_outwards_2.dart.legacy.transformed.expect @@ -51,7 +51,7 @@ abstract class _A&M0&M1&M2 extends self::_A&M0&M1 implements self::M2 { } class A extends self::_A&M0&M1&M2 { synthetic constructor •() → self::A - : super self::M0::•() + : super self::_A&M0&M1&M2::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference/mixin_inference_outwards_2.dart.strong.expect b/pkg/front_end/testcases/inference/mixin_inference_outwards_2.dart.strong.expect index e17639c615e..d1333918a71 100644 --- a/pkg/front_end/testcases/inference/mixin_inference_outwards_2.dart.strong.expect +++ b/pkg/front_end/testcases/inference/mixin_inference_outwards_2.dart.strong.expect @@ -34,7 +34,7 @@ abstract class _A&M0&M1&M2 = self::_A&M0&M1 with self::M2 { } class A extends self::_A&M0&M1&M2 { synthetic constructor •() → self::A - : super self::M0::•() + : super self::_A&M0&M1&M2::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference/mixin_inference_outwards_2.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/mixin_inference_outwards_2.dart.strong.transformed.expect index 37d01dc461e..d4edaee5083 100644 --- a/pkg/front_end/testcases/inference/mixin_inference_outwards_2.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/inference/mixin_inference_outwards_2.dart.strong.transformed.expect @@ -34,7 +34,7 @@ abstract class _A&M0&M1&M2 extends self::_A&M0&M1 implements self::M2 } class A extends self::_A&M0&M1&M2 { synthetic constructor •() → self::A - : super self::M0::•() + : super self::_A&M0&M1&M2::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference/mixin_inference_outwards_3.dart.legacy.expect b/pkg/front_end/testcases/inference/mixin_inference_outwards_3.dart.legacy.expect index 0efa32135a2..c581250bf15 100644 --- a/pkg/front_end/testcases/inference/mixin_inference_outwards_3.dart.legacy.expect +++ b/pkg/front_end/testcases/inference/mixin_inference_outwards_3.dart.legacy.expect @@ -53,7 +53,7 @@ abstract class _A&Object&M0&M1 = self::_A&Object&M0 with self::M1 { } class A extends self::_A&Object&M0&M1 { synthetic constructor •() → self::A - : super core::Object::•() + : super self::_A&Object&M0&M1::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference/mixin_inference_outwards_3.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/mixin_inference_outwards_3.dart.legacy.transformed.expect index cbab3467461..f81e503a025 100644 --- a/pkg/front_end/testcases/inference/mixin_inference_outwards_3.dart.legacy.transformed.expect +++ b/pkg/front_end/testcases/inference/mixin_inference_outwards_3.dart.legacy.transformed.expect @@ -41,7 +41,7 @@ abstract class _A&Object&M0&M1 extends self::_A&Object&M0 implements self::M1 { } class A extends self::_A&Object&M0&M1 { synthetic constructor •() → self::A - : super core::Object::•() + : super self::_A&Object&M0&M1::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference/mixin_inference_outwards_4.dart.legacy.expect b/pkg/front_end/testcases/inference/mixin_inference_outwards_4.dart.legacy.expect index 4f246b25f20..75fb9005bd6 100644 --- a/pkg/front_end/testcases/inference/mixin_inference_outwards_4.dart.legacy.expect +++ b/pkg/front_end/testcases/inference/mixin_inference_outwards_4.dart.legacy.expect @@ -43,7 +43,7 @@ abstract class _A&Object&M0&M1 = self::_A&Object&M0 with self::M1 { } class A extends self::_A&Object&M0&M1 implements self::I { synthetic constructor •() → self::A - : super core::Object::•() + : super self::_A&Object&M0&M1::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference/mixin_inference_outwards_4.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/mixin_inference_outwards_4.dart.legacy.transformed.expect index 5b2d65ab2f7..06fa1b82044 100644 --- a/pkg/front_end/testcases/inference/mixin_inference_outwards_4.dart.legacy.transformed.expect +++ b/pkg/front_end/testcases/inference/mixin_inference_outwards_4.dart.legacy.transformed.expect @@ -36,7 +36,7 @@ abstract class _A&Object&M0&M1 extends self::_A&Object&M0 implements self::M1 { synthetic constructor •() → self::A - : super core::Object::•() + : super self::_A&Object&M0&M1::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference/mixin_inference_outwards_4.dart.strong.expect b/pkg/front_end/testcases/inference/mixin_inference_outwards_4.dart.strong.expect index 4f246b25f20..75fb9005bd6 100644 --- a/pkg/front_end/testcases/inference/mixin_inference_outwards_4.dart.strong.expect +++ b/pkg/front_end/testcases/inference/mixin_inference_outwards_4.dart.strong.expect @@ -43,7 +43,7 @@ abstract class _A&Object&M0&M1 = self::_A&Object&M0 with self::M1 { } class A extends self::_A&Object&M0&M1 implements self::I { synthetic constructor •() → self::A - : super core::Object::•() + : super self::_A&Object&M0&M1::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference/mixin_inference_unification_1.dart.legacy.expect b/pkg/front_end/testcases/inference/mixin_inference_unification_1.dart.legacy.expect index 136a52fe200..d2e60401f4b 100644 --- a/pkg/front_end/testcases/inference/mixin_inference_unification_1.dart.legacy.expect +++ b/pkg/front_end/testcases/inference/mixin_inference_unification_1.dart.legacy.expect @@ -53,7 +53,7 @@ abstract class _A&Object&M0&M1 = self::_A&Object&M0 with self::M1 { } class A extends self::_A&Object&M0&M1 { synthetic constructor •() → self::A - : super core::Object::•() + : super self::_A&Object&M0&M1::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference/mixin_inference_unification_1.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/mixin_inference_unification_1.dart.legacy.transformed.expect index f4e7416d627..a22753fb8bd 100644 --- a/pkg/front_end/testcases/inference/mixin_inference_unification_1.dart.legacy.transformed.expect +++ b/pkg/front_end/testcases/inference/mixin_inference_unification_1.dart.legacy.transformed.expect @@ -41,7 +41,7 @@ abstract class _A&Object&M0&M1 extends self::_A&Object&M0 implements self::M1 { } class A extends self::_A&Object&M0&M1 { synthetic constructor •() → self::A - : super core::Object::•() + : super self::_A&Object&M0&M1::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference/mixin_inference_unification_2.dart.legacy.expect b/pkg/front_end/testcases/inference/mixin_inference_unification_2.dart.legacy.expect index 6107331a032..153ce4a23f7 100644 --- a/pkg/front_end/testcases/inference/mixin_inference_unification_2.dart.legacy.expect +++ b/pkg/front_end/testcases/inference/mixin_inference_unification_2.dart.legacy.expect @@ -57,7 +57,7 @@ abstract class _A&Object&M0&M1 = self::_A&Object&M0 with self::M1 { } class A extends self::_A&Object&M0&M1 { synthetic constructor •() → self::A - : super core::Object::•() + : super self::_A&Object&M0&M1::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference/mixin_inference_unification_2.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/mixin_inference_unification_2.dart.legacy.transformed.expect index 7179092cd8d..826e6a34627 100644 --- a/pkg/front_end/testcases/inference/mixin_inference_unification_2.dart.legacy.transformed.expect +++ b/pkg/front_end/testcases/inference/mixin_inference_unification_2.dart.legacy.transformed.expect @@ -43,7 +43,7 @@ abstract class _A&Object&M0&M1 extends self::_A&Object&M0 implements self::M1 { } class A extends self::_A&Object&M0&M1 { synthetic constructor •() → self::A - : super core::Object::•() + : super self::_A&Object&M0&M1::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/mixin.dart.legacy.expect b/pkg/front_end/testcases/mixin.dart.legacy.expect index 6270bd2a364..c47eaf25e58 100644 --- a/pkg/front_end/testcases/mixin.dart.legacy.expect +++ b/pkg/front_end/testcases/mixin.dart.legacy.expect @@ -14,7 +14,7 @@ abstract class _B&Object&M1&M2 = self::_B&Object&M1 with self::M2 { } class B extends self::_B&Object&M1&M2 { constructor •(dynamic value) → self::B - : super core::Object::•() + : super self::_B&Object&M1&M2::•() ; } abstract class M1 extends core::Object { @@ -43,7 +43,7 @@ abstract class _C&Object&M1&M2 = self::_C&Object&M1 with self::M2 { } class C extends self::_C&Object&M1&M2 { constructor •(dynamic value) → self::C - : super core::Object::•() + : super self::_C&Object&M1&M2::•() ; } abstract class G1 extends core::Object { @@ -60,7 +60,7 @@ abstract class _D&Object&G1 = core::Object wit } class D extends self::_D&Object&G1 { synthetic constructor •() → self::D - : super core::Object::•() + : super self::_D&Object&G1::•() ; } static method main() → dynamic { diff --git a/pkg/front_end/testcases/mixin.dart.legacy.transformed.expect b/pkg/front_end/testcases/mixin.dart.legacy.transformed.expect index 7152f91425e..7af41626bcd 100644 --- a/pkg/front_end/testcases/mixin.dart.legacy.transformed.expect +++ b/pkg/front_end/testcases/mixin.dart.legacy.transformed.expect @@ -18,7 +18,7 @@ abstract class _B&Object&M1&M2 extends self::_B&Object&M1 implements self::M2 { } class B extends self::_B&Object&M1&M2 { constructor •(dynamic value) → self::B - : super core::Object::•() + : super self::_B&Object&M1&M2::•() ; } abstract class M1 extends core::Object { @@ -51,7 +51,7 @@ abstract class _C&Object&M1&M2 extends self::_C&Object&M1 implements self::M2 { } class C extends self::_C&Object&M1&M2 { constructor •(dynamic value) → self::C - : super core::Object::•() + : super self::_C&Object&M1&M2::•() ; } abstract class G1 extends core::Object { @@ -70,7 +70,7 @@ abstract class _D&Object&G1 extends core::Obje } class D extends self::_D&Object&G1 { synthetic constructor •() → self::D - : super core::Object::•() + : super self::_D&Object&G1::•() ; } static method main() → dynamic { diff --git a/pkg/front_end/testcases/mixin.dart.strong.expect b/pkg/front_end/testcases/mixin.dart.strong.expect index f3bc002106c..f8971a40ef8 100644 --- a/pkg/front_end/testcases/mixin.dart.strong.expect +++ b/pkg/front_end/testcases/mixin.dart.strong.expect @@ -14,7 +14,7 @@ abstract class _B&Object&M1&M2 = self::_B&Object&M1 with self::M2 { } class B extends self::_B&Object&M1&M2 { constructor •(dynamic value) → self::B - : super core::Object::•() + : super self::_B&Object&M1&M2::•() ; } abstract class M1 extends core::Object { @@ -43,7 +43,7 @@ abstract class _C&Object&M1&M2 = self::_C&Object&M1 with self::M2 { } class C extends self::_C&Object&M1&M2 { constructor •(dynamic value) → self::C - : super core::Object::•() + : super self::_C&Object&M1&M2::•() ; } abstract class G1 extends core::Object { @@ -60,7 +60,7 @@ abstract class _D&Object&G1 = core::Object wit } class D extends self::_D&Object&G1 { synthetic constructor •() → self::D - : super core::Object::•() + : super self::_D&Object&G1::•() ; } static method main() → dynamic { diff --git a/pkg/front_end/testcases/mixin.dart.strong.transformed.expect b/pkg/front_end/testcases/mixin.dart.strong.transformed.expect index 3dff5ebe69a..13bbc5e7f82 100644 --- a/pkg/front_end/testcases/mixin.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/mixin.dart.strong.transformed.expect @@ -18,7 +18,7 @@ abstract class _B&Object&M1&M2 extends self::_B&Object&M1 implements self::M2 { } class B extends self::_B&Object&M1&M2 { constructor •(dynamic value) → self::B - : super core::Object::•() + : super self::_B&Object&M1&M2::•() ; } abstract class M1 extends core::Object { @@ -51,7 +51,7 @@ abstract class _C&Object&M1&M2 extends self::_C&Object&M1 implements self::M2 { } class C extends self::_C&Object&M1&M2 { constructor •(dynamic value) → self::C - : super core::Object::•() + : super self::_C&Object&M1&M2::•() ; } abstract class G1 extends core::Object { @@ -70,7 +70,7 @@ abstract class _D&Object&G1 extends core::Obje } class D extends self::_D&Object&G1 { synthetic constructor •() → self::D - : super core::Object::•() + : super self::_D&Object&G1::•() ; } static method main() → dynamic { diff --git a/pkg/front_end/testcases/mixin_application_override.dart.legacy.expect b/pkg/front_end/testcases/mixin_application_override.dart.legacy.expect index 142551ce4ca..52129f0d0ef 100644 --- a/pkg/front_end/testcases/mixin_application_override.dart.legacy.expect +++ b/pkg/front_end/testcases/mixin_application_override.dart.legacy.expect @@ -233,7 +233,7 @@ abstract class _B0&S&M = self::S with self::M { } class B0 extends self::_B0&S&M { synthetic constructor •() → self::B0 - : super self::S::•() + : super self::_B0&S&M::•() ; } abstract class _B1&S&M1 = self::S with self::M1 { @@ -248,7 +248,7 @@ abstract class _B1&S&M1&M = self::_B1&S&M1 with self::M { } class B1 extends self::_B1&S&M1&M { synthetic constructor •() → self::B1 - : super self::S::•() + : super self::_B1&S&M1&M::•() ; } abstract class _B2&S&M1 = self::S with self::M1 { @@ -268,7 +268,7 @@ abstract class _B2&S&M1&M2&M = self::_B2&S&M1&M2 with self::M { } class B2 extends self::_B2&S&M1&M2&M { synthetic constructor •() → self::B2 - : super self::S::•() + : super self::_B2&S&M1&M2&M::•() ; } abstract class _B0X&S&M = self::S with self::M { @@ -283,7 +283,7 @@ abstract class _B0X&S&M&MX = self::_B0X&S&M with self::MX { } class B0X extends self::_B0X&S&M&MX { synthetic constructor •() → self::B0X - : super self::S::•() + : super self::_B0X&S&M&MX::•() ; } abstract class _B1X&S&M1 = self::S with self::M1 { @@ -303,7 +303,7 @@ abstract class _B1X&S&M1&M&MX = self::_B1X&S&M1&M with self::MX { } class B1X extends self::_B1X&S&M1&M&MX { synthetic constructor •() → self::B1X - : super self::S::•() + : super self::_B1X&S&M1&M&MX::•() ; } abstract class _B2X&S&M1 = self::S with self::M1 { @@ -328,7 +328,7 @@ abstract class _B2X&S&M1&M2&M&MX = self::_B2X&S&M1&M2&M with self::MX { } class B2X extends self::_B2X&S&M1&M2&M&MX { synthetic constructor •() → self::B2X - : super self::S::•() + : super self::_B2X&S&M1&M2&M&MX::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/mixin_application_override.dart.legacy.transformed.expect b/pkg/front_end/testcases/mixin_application_override.dart.legacy.transformed.expect index 94d1bd71bf6..381523aad01 100644 --- a/pkg/front_end/testcases/mixin_application_override.dart.legacy.transformed.expect +++ b/pkg/front_end/testcases/mixin_application_override.dart.legacy.transformed.expect @@ -118,7 +118,7 @@ abstract class _B0&S&M extends self::S implements self::M { } class B0 extends self::_B0&S&M { synthetic constructor •() → self::B0 - : super self::S::•() + : super self::_B0&S&M::•() ; } abstract class _B1&S&M1 extends self::S implements self::M1 { @@ -134,7 +134,7 @@ abstract class _B1&S&M1&M extends self::_B1&S&M1 implements self::M { } class B1 extends self::_B1&S&M1&M { synthetic constructor •() → self::B1 - : super self::S::•() + : super self::_B1&S&M1&M::•() ; } abstract class _B2&S&M1 extends self::S implements self::M1 { @@ -155,7 +155,7 @@ abstract class _B2&S&M1&M2&M extends self::_B2&S&M1&M2 implements self::M { } class B2 extends self::_B2&S&M1&M2&M { synthetic constructor •() → self::B2 - : super self::S::•() + : super self::_B2&S&M1&M2&M::•() ; } abstract class _B0X&S&M extends self::S implements self::M { @@ -171,7 +171,7 @@ abstract class _B0X&S&M&MX extends self::_B0X&S&M implements self::MX { } class B0X extends self::_B0X&S&M&MX { synthetic constructor •() → self::B0X - : super self::S::•() + : super self::_B0X&S&M&MX::•() ; } abstract class _B1X&S&M1 extends self::S implements self::M1 { @@ -192,7 +192,7 @@ abstract class _B1X&S&M1&M&MX extends self::_B1X&S&M1&M implements self::MX { } class B1X extends self::_B1X&S&M1&M&MX { synthetic constructor •() → self::B1X - : super self::S::•() + : super self::_B1X&S&M1&M&MX::•() ; } abstract class _B2X&S&M1 extends self::S implements self::M1 { @@ -218,7 +218,7 @@ abstract class _B2X&S&M1&M2&M&MX extends self::_B2X&S&M1&M2&M implements self::M } class B2X extends self::_B2X&S&M1&M2&M&MX { synthetic constructor •() → self::B2X - : super self::S::•() + : super self::_B2X&S&M1&M2&M&MX::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/mixin_application_override.dart.strong.expect b/pkg/front_end/testcases/mixin_application_override.dart.strong.expect index a25b92fa50a..c8c6a906a4f 100644 --- a/pkg/front_end/testcases/mixin_application_override.dart.strong.expect +++ b/pkg/front_end/testcases/mixin_application_override.dart.strong.expect @@ -290,7 +290,7 @@ abstract class _B0&S&M = self::S with self::M { } class B0 extends self::_B0&S&M { synthetic constructor •() → self::B0 - : super self::S::•() + : super self::_B0&S&M::•() ; } abstract class _B1&S&M1 = self::S with self::M1 { @@ -306,7 +306,7 @@ abstract class _B1&S&M1&M = self::_B1&S&M1 with self::M { } class B1 extends self::_B1&S&M1&M { synthetic constructor •() → self::B1 - : super self::S::•() + : super self::_B1&S&M1&M::•() ; } abstract class _B2&S&M1 = self::S with self::M1 { @@ -327,7 +327,7 @@ abstract class _B2&S&M1&M2&M = self::_B2&S&M1&M2 with self::M { } class B2 extends self::_B2&S&M1&M2&M { synthetic constructor •() → self::B2 - : super self::S::•() + : super self::_B2&S&M1&M2&M::•() ; } abstract class _B0X&S&M = self::S with self::M { @@ -343,7 +343,7 @@ abstract class _B0X&S&M&MX = self::_B0X&S&M with self::MX { } class B0X extends self::_B0X&S&M&MX { synthetic constructor •() → self::B0X - : super self::S::•() + : super self::_B0X&S&M&MX::•() ; } abstract class _B1X&S&M1 = self::S with self::M1 { @@ -364,7 +364,7 @@ abstract class _B1X&S&M1&M&MX = self::_B1X&S&M1&M with self::MX { } class B1X extends self::_B1X&S&M1&M&MX { synthetic constructor •() → self::B1X - : super self::S::•() + : super self::_B1X&S&M1&M&MX::•() ; } abstract class _B2X&S&M1 = self::S with self::M1 { @@ -390,7 +390,7 @@ abstract class _B2X&S&M1&M2&M&MX = self::_B2X&S&M1&M2&M with self::MX { } class B2X extends self::_B2X&S&M1&M2&M&MX { synthetic constructor •() → self::B2X - : super self::S::•() + : super self::_B2X&S&M1&M2&M&MX::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/mixin_constructors_with_default_values.dart.legacy.expect b/pkg/front_end/testcases/mixin_constructors_with_default_values.dart.legacy.expect index daec74c3679..b9d9373379c 100644 --- a/pkg/front_end/testcases/mixin_constructors_with_default_values.dart.legacy.expect +++ b/pkg/front_end/testcases/mixin_constructors_with_default_values.dart.legacy.expect @@ -21,7 +21,7 @@ class D = self::C with self::M { } class E extends self::D { synthetic constructor •() → self::E - : super self::C::•() + : super self::D::•() ; } abstract class _F&C&M = self::C with self::M { @@ -31,7 +31,7 @@ abstract class _F&C&M = self::C with self::M { } class F extends self::_F&C&M { synthetic constructor •() → self::F - : super self::C::•() + : super self::_F&C&M::•() ; } static method main() → dynamic { diff --git a/pkg/front_end/testcases/mixin_constructors_with_default_values.dart.legacy.transformed.expect b/pkg/front_end/testcases/mixin_constructors_with_default_values.dart.legacy.transformed.expect index ce127098012..3e9f1e93cf3 100644 --- a/pkg/front_end/testcases/mixin_constructors_with_default_values.dart.legacy.transformed.expect +++ b/pkg/front_end/testcases/mixin_constructors_with_default_values.dart.legacy.transformed.expect @@ -21,7 +21,7 @@ class D extends self::C implements self::M { } class E extends self::D { synthetic constructor •() → self::E - : super self::C::•() + : super self::D::•() ; } abstract class _F&C&M extends self::C implements self::M { @@ -31,7 +31,7 @@ abstract class _F&C&M extends self::C implements self::M { } class F extends self::_F&C&M { synthetic constructor •() → self::F - : super self::C::•() + : super self::_F&C&M::•() ; } static method main() → dynamic { diff --git a/pkg/front_end/testcases/mixin_constructors_with_default_values.dart.strong.expect b/pkg/front_end/testcases/mixin_constructors_with_default_values.dart.strong.expect index c3bb2f6fc5a..67701f21e84 100644 --- a/pkg/front_end/testcases/mixin_constructors_with_default_values.dart.strong.expect +++ b/pkg/front_end/testcases/mixin_constructors_with_default_values.dart.strong.expect @@ -21,7 +21,7 @@ class D = self::C with self::M { } class E extends self::D { synthetic constructor •() → self::E - : super self::C::•() + : super self::D::•() ; } abstract class _F&C&M = self::C with self::M { @@ -31,7 +31,7 @@ abstract class _F&C&M = self::C with self::M { } class F extends self::_F&C&M { synthetic constructor •() → self::F - : super self::C::•() + : super self::_F&C&M::•() ; } static method main() → dynamic { diff --git a/pkg/front_end/testcases/mixin_constructors_with_default_values.dart.strong.transformed.expect b/pkg/front_end/testcases/mixin_constructors_with_default_values.dart.strong.transformed.expect index 97235bc7ee8..e52a7ff9910 100644 --- a/pkg/front_end/testcases/mixin_constructors_with_default_values.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/mixin_constructors_with_default_values.dart.strong.transformed.expect @@ -21,7 +21,7 @@ class D extends self::C implements self::M { } class E extends self::D { synthetic constructor •() → self::E - : super self::C::•() + : super self::D::•() ; } abstract class _F&C&M extends self::C implements self::M { @@ -31,7 +31,7 @@ abstract class _F&C&M extends self::C implements self::M { } class F extends self::_F&C&M { synthetic constructor •() → self::F - : super self::C::•() + : super self::_F&C&M::•() ; } static method main() → dynamic { diff --git a/pkg/front_end/testcases/mixin_inherited_setter_for_mixed_in_field.dart.legacy.expect b/pkg/front_end/testcases/mixin_inherited_setter_for_mixed_in_field.dart.legacy.expect index 0efea2e4c30..fb518e48974 100644 --- a/pkg/front_end/testcases/mixin_inherited_setter_for_mixed_in_field.dart.legacy.expect +++ b/pkg/front_end/testcases/mixin_inherited_setter_for_mixed_in_field.dart.legacy.expect @@ -28,7 +28,7 @@ abstract class _Foo&Object&C = core::Object with self::C { } class Foo extends self::_Foo&Object&C { synthetic constructor •() → self::Foo - : super core::Object::•() + : super self::_Foo&Object&C::•() ; } class B extends self::A { diff --git a/pkg/front_end/testcases/mixin_inherited_setter_for_mixed_in_field.dart.legacy.transformed.expect b/pkg/front_end/testcases/mixin_inherited_setter_for_mixed_in_field.dart.legacy.transformed.expect index 43b415d7879..9db2af2d7f9 100644 --- a/pkg/front_end/testcases/mixin_inherited_setter_for_mixed_in_field.dart.legacy.transformed.expect +++ b/pkg/front_end/testcases/mixin_inherited_setter_for_mixed_in_field.dart.legacy.transformed.expect @@ -32,7 +32,7 @@ abstract class _Foo&Object&C extends core::Object implements self::C { } class Foo extends self::_Foo&Object&C { synthetic constructor •() → self::Foo - : super core::Object::•() + : super self::_Foo&Object&C::•() ; } class B extends self::A { diff --git a/pkg/front_end/testcases/mixin_inherited_setter_for_mixed_in_field.dart.strong.expect b/pkg/front_end/testcases/mixin_inherited_setter_for_mixed_in_field.dart.strong.expect index 0b7454462bc..b73697be3fe 100644 --- a/pkg/front_end/testcases/mixin_inherited_setter_for_mixed_in_field.dart.strong.expect +++ b/pkg/front_end/testcases/mixin_inherited_setter_for_mixed_in_field.dart.strong.expect @@ -28,7 +28,7 @@ abstract class _Foo&Object&C = core::Object with self::C { } class Foo extends self::_Foo&Object&C { synthetic constructor •() → self::Foo - : super core::Object::•() + : super self::_Foo&Object&C::•() ; } class B extends self::A { diff --git a/pkg/front_end/testcases/mixin_inherited_setter_for_mixed_in_field.dart.strong.transformed.expect b/pkg/front_end/testcases/mixin_inherited_setter_for_mixed_in_field.dart.strong.transformed.expect index bab35f48b17..6b382604911 100644 --- a/pkg/front_end/testcases/mixin_inherited_setter_for_mixed_in_field.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/mixin_inherited_setter_for_mixed_in_field.dart.strong.transformed.expect @@ -32,7 +32,7 @@ abstract class _Foo&Object&C extends core::Object implements self::C { } class Foo extends self::_Foo&Object&C { synthetic constructor •() → self::Foo - : super core::Object::•() + : super self::_Foo&Object&C::•() ; } class B extends self::A { diff --git a/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_arent_mixed_in.dart.legacy.expect b/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_arent_mixed_in.dart.legacy.expect index ef2820dfd9f..75331f8c485 100644 --- a/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_arent_mixed_in.dart.legacy.expect +++ b/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_arent_mixed_in.dart.legacy.expect @@ -28,7 +28,7 @@ abstract class _C&Object&B = core::Object with self::B { } class C extends self::_C&Object&B { synthetic constructor •() → self::C - : super core::Object::•() + : super self::_C&Object&B::•() ; get foo() → core::int return 42; diff --git a/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_arent_mixed_in.dart.legacy.transformed.expect b/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_arent_mixed_in.dart.legacy.transformed.expect index 6a81396b954..b3fc1ec4ce8 100644 --- a/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_arent_mixed_in.dart.legacy.transformed.expect +++ b/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_arent_mixed_in.dart.legacy.transformed.expect @@ -32,7 +32,7 @@ abstract class _C&Object&B extends core::Object implements self::B { } class C extends self::_C&Object&B { synthetic constructor •() → self::C - : super core::Object::•() + : super self::_C&Object&B::•() ; get foo() → core::int return 42; diff --git a/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_arent_mixed_in.dart.strong.expect b/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_arent_mixed_in.dart.strong.expect index b00b8c0397d..00d48b8246b 100644 --- a/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_arent_mixed_in.dart.strong.expect +++ b/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_arent_mixed_in.dart.strong.expect @@ -28,7 +28,7 @@ abstract class _C&Object&B = core::Object with self::B { } class C extends self::_C&Object&B { synthetic constructor •() → self::C - : super core::Object::•() + : super self::_C&Object&B::•() ; get foo() → core::int return 42; diff --git a/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_arent_mixed_in.dart.strong.transformed.expect b/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_arent_mixed_in.dart.strong.transformed.expect index 72a6cef7bf0..8ec90ad3d20 100644 --- a/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_arent_mixed_in.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/no_such_method_forwarders/abstract_accessors_from_field_arent_mixed_in.dart.strong.transformed.expect @@ -32,7 +32,7 @@ abstract class _C&Object&B extends core::Object implements self::B { } class C extends self::_C&Object&B { synthetic constructor •() → self::C - : super core::Object::•() + : super self::_C&Object&B::•() ; get foo() → core::int return 42; diff --git a/pkg/front_end/testcases/no_such_method_forwarders/concrete_method_over_forwarder_in_mixin_application.dart.legacy.expect b/pkg/front_end/testcases/no_such_method_forwarders/concrete_method_over_forwarder_in_mixin_application.dart.legacy.expect index 58812158499..521beddc991 100644 --- a/pkg/front_end/testcases/no_such_method_forwarders/concrete_method_over_forwarder_in_mixin_application.dart.legacy.expect +++ b/pkg/front_end/testcases/no_such_method_forwarders/concrete_method_over_forwarder_in_mixin_application.dart.legacy.expect @@ -30,7 +30,7 @@ abstract class _C&A&B = self::A with self::B { } class C extends self::_C&A&B { synthetic constructor •() → self::C - : super self::A::•() + : super self::_C&A&B::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/no_such_method_forwarders/concrete_method_over_forwarder_in_mixin_application.dart.legacy.transformed.expect b/pkg/front_end/testcases/no_such_method_forwarders/concrete_method_over_forwarder_in_mixin_application.dart.legacy.transformed.expect index 32a808df40b..528ca8803e0 100644 --- a/pkg/front_end/testcases/no_such_method_forwarders/concrete_method_over_forwarder_in_mixin_application.dart.legacy.transformed.expect +++ b/pkg/front_end/testcases/no_such_method_forwarders/concrete_method_over_forwarder_in_mixin_application.dart.legacy.transformed.expect @@ -32,7 +32,7 @@ abstract class _C&A&B extends self::A implements self::B { } class C extends self::_C&A&B { synthetic constructor •() → self::C - : super self::A::•() + : super self::_C&A&B::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/no_such_method_forwarders/concrete_method_over_forwarder_in_mixin_application.dart.strong.expect b/pkg/front_end/testcases/no_such_method_forwarders/concrete_method_over_forwarder_in_mixin_application.dart.strong.expect index 1418146a3ad..b71a51617c5 100644 --- a/pkg/front_end/testcases/no_such_method_forwarders/concrete_method_over_forwarder_in_mixin_application.dart.strong.expect +++ b/pkg/front_end/testcases/no_such_method_forwarders/concrete_method_over_forwarder_in_mixin_application.dart.strong.expect @@ -30,7 +30,7 @@ abstract class _C&A&B = self::A with self::B { } class C extends self::_C&A&B { synthetic constructor •() → self::C - : super self::A::•() + : super self::_C&A&B::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/no_such_method_forwarders/concrete_method_over_forwarder_in_mixin_application.dart.strong.transformed.expect b/pkg/front_end/testcases/no_such_method_forwarders/concrete_method_over_forwarder_in_mixin_application.dart.strong.transformed.expect index 193af7a648c..7cd29a771b3 100644 --- a/pkg/front_end/testcases/no_such_method_forwarders/concrete_method_over_forwarder_in_mixin_application.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/no_such_method_forwarders/concrete_method_over_forwarder_in_mixin_application.dart.strong.transformed.expect @@ -32,7 +32,7 @@ abstract class _C&A&B extends self::A implements self::B { } class C extends self::_C&A&B { synthetic constructor •() → self::C - : super self::A::•() + : super self::_C&A&B::•() ; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/no_such_method_forwarders/forwarders_not_assumed_from_mixin.dart.legacy.expect b/pkg/front_end/testcases/no_such_method_forwarders/forwarders_not_assumed_from_mixin.dart.legacy.expect index a38559872a0..43df9dd4e4f 100644 --- a/pkg/front_end/testcases/no_such_method_forwarders/forwarders_not_assumed_from_mixin.dart.legacy.expect +++ b/pkg/front_end/testcases/no_such_method_forwarders/forwarders_not_assumed_from_mixin.dart.legacy.expect @@ -24,7 +24,7 @@ abstract class _B&Object&A = core::Object with self::A { } class B extends self::_B&Object&A { synthetic constructor •() → self::B - : super core::Object::•() + : super self::_B&Object&A::•() ; no-such-method-forwarder method foo() → void return this.{self::A::noSuchMethod}(new core::_InvocationMirror::_withType(#foo, 0, const [], const [], core::Map::unmodifiable(const {}))); diff --git a/pkg/front_end/testcases/no_such_method_forwarders/forwarders_not_assumed_from_mixin.dart.legacy.transformed.expect b/pkg/front_end/testcases/no_such_method_forwarders/forwarders_not_assumed_from_mixin.dart.legacy.transformed.expect index eda31a1d658..df41d65ffd8 100644 --- a/pkg/front_end/testcases/no_such_method_forwarders/forwarders_not_assumed_from_mixin.dart.legacy.transformed.expect +++ b/pkg/front_end/testcases/no_such_method_forwarders/forwarders_not_assumed_from_mixin.dart.legacy.transformed.expect @@ -26,7 +26,7 @@ abstract class _B&Object&A extends core::Object implements self::A { } class B extends self::_B&Object&A { synthetic constructor •() → self::B - : super core::Object::•() + : super self::_B&Object&A::•() ; no-such-method-forwarder method foo() → void return this.{self::A::noSuchMethod}(new core::_InvocationMirror::_withType(#foo, 0, const [], const [], core::Map::unmodifiable(const {}))); diff --git a/pkg/front_end/testcases/no_such_method_forwarders/forwarders_not_assumed_from_mixin.dart.strong.expect b/pkg/front_end/testcases/no_such_method_forwarders/forwarders_not_assumed_from_mixin.dart.strong.expect index a38559872a0..43df9dd4e4f 100644 --- a/pkg/front_end/testcases/no_such_method_forwarders/forwarders_not_assumed_from_mixin.dart.strong.expect +++ b/pkg/front_end/testcases/no_such_method_forwarders/forwarders_not_assumed_from_mixin.dart.strong.expect @@ -24,7 +24,7 @@ abstract class _B&Object&A = core::Object with self::A { } class B extends self::_B&Object&A { synthetic constructor •() → self::B - : super core::Object::•() + : super self::_B&Object&A::•() ; no-such-method-forwarder method foo() → void return this.{self::A::noSuchMethod}(new core::_InvocationMirror::_withType(#foo, 0, const [], const [], core::Map::unmodifiable(const {}))); diff --git a/pkg/front_end/testcases/no_such_method_forwarders/forwarders_not_assumed_from_mixin.dart.strong.transformed.expect b/pkg/front_end/testcases/no_such_method_forwarders/forwarders_not_assumed_from_mixin.dart.strong.transformed.expect index eda31a1d658..df41d65ffd8 100644 --- a/pkg/front_end/testcases/no_such_method_forwarders/forwarders_not_assumed_from_mixin.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/no_such_method_forwarders/forwarders_not_assumed_from_mixin.dart.strong.transformed.expect @@ -26,7 +26,7 @@ abstract class _B&Object&A extends core::Object implements self::A { } class B extends self::_B&Object&A { synthetic constructor •() → self::B - : super core::Object::•() + : super self::_B&Object&A::•() ; no-such-method-forwarder method foo() → void return this.{self::A::noSuchMethod}(new core::_InvocationMirror::_withType(#foo, 0, const [], const [], core::Map::unmodifiable(const {}))); diff --git a/pkg/front_end/testcases/no_such_method_forwarders/interface_with_nsm.dart.legacy.expect b/pkg/front_end/testcases/no_such_method_forwarders/interface_with_nsm.dart.legacy.expect index a86290b9e35..3bbf6e3e214 100644 --- a/pkg/front_end/testcases/no_such_method_forwarders/interface_with_nsm.dart.legacy.expect +++ b/pkg/front_end/testcases/no_such_method_forwarders/interface_with_nsm.dart.legacy.expect @@ -25,7 +25,7 @@ abstract class _A&Object&M = core::Object with self::M { } class A extends self::_A&Object&M implements self::I { synthetic constructor •() → self::A - : super core::Object::•() + : super self::_A&Object&M::•() ; no-such-method-forwarder method foo() → void return this.{self::M::noSuchMethod}(new core::_InvocationMirror::_withType(#foo, 0, const [], const [], core::Map::unmodifiable(const {}))); @@ -37,7 +37,7 @@ abstract class _B&Object&M = core::Object with self::M { } class B extends self::_B&Object&M implements self::I { synthetic constructor •() → self::B - : super core::Object::•() + : super self::_B&Object&M::•() ; no-such-method-forwarder method foo() → void return this.{self::M::noSuchMethod}(new core::_InvocationMirror::_withType(#foo, 0, const [], const [], core::Map::unmodifiable(const {}))); diff --git a/pkg/front_end/testcases/no_such_method_forwarders/interface_with_nsm.dart.legacy.transformed.expect b/pkg/front_end/testcases/no_such_method_forwarders/interface_with_nsm.dart.legacy.transformed.expect index 6d9efb3e944..95e785de0ed 100644 --- a/pkg/front_end/testcases/no_such_method_forwarders/interface_with_nsm.dart.legacy.transformed.expect +++ b/pkg/front_end/testcases/no_such_method_forwarders/interface_with_nsm.dart.legacy.transformed.expect @@ -27,7 +27,7 @@ abstract class _A&Object&M extends core::Object implements self::M { } class A extends self::_A&Object&M implements self::I { synthetic constructor •() → self::A - : super core::Object::•() + : super self::_A&Object&M::•() ; no-such-method-forwarder method foo() → void return this.{self::M::noSuchMethod}(new core::_InvocationMirror::_withType(#foo, 0, const [], const [], core::Map::unmodifiable(const {}))); @@ -41,7 +41,7 @@ abstract class _B&Object&M extends core::Object implements self::M { } class B extends self::_B&Object&M implements self::I { synthetic constructor •() → self::B - : super core::Object::•() + : super self::_B&Object&M::•() ; no-such-method-forwarder method foo() → void return this.{self::M::noSuchMethod}(new core::_InvocationMirror::_withType(#foo, 0, const [], const [], core::Map::unmodifiable(const {}))); diff --git a/pkg/front_end/testcases/no_such_method_forwarders/interface_with_nsm.dart.strong.expect b/pkg/front_end/testcases/no_such_method_forwarders/interface_with_nsm.dart.strong.expect index a86290b9e35..3bbf6e3e214 100644 --- a/pkg/front_end/testcases/no_such_method_forwarders/interface_with_nsm.dart.strong.expect +++ b/pkg/front_end/testcases/no_such_method_forwarders/interface_with_nsm.dart.strong.expect @@ -25,7 +25,7 @@ abstract class _A&Object&M = core::Object with self::M { } class A extends self::_A&Object&M implements self::I { synthetic constructor •() → self::A - : super core::Object::•() + : super self::_A&Object&M::•() ; no-such-method-forwarder method foo() → void return this.{self::M::noSuchMethod}(new core::_InvocationMirror::_withType(#foo, 0, const [], const [], core::Map::unmodifiable(const {}))); @@ -37,7 +37,7 @@ abstract class _B&Object&M = core::Object with self::M { } class B extends self::_B&Object&M implements self::I { synthetic constructor •() → self::B - : super core::Object::•() + : super self::_B&Object&M::•() ; no-such-method-forwarder method foo() → void return this.{self::M::noSuchMethod}(new core::_InvocationMirror::_withType(#foo, 0, const [], const [], core::Map::unmodifiable(const {}))); diff --git a/pkg/front_end/testcases/no_such_method_forwarders/interface_with_nsm.dart.strong.transformed.expect b/pkg/front_end/testcases/no_such_method_forwarders/interface_with_nsm.dart.strong.transformed.expect index 6d9efb3e944..95e785de0ed 100644 --- a/pkg/front_end/testcases/no_such_method_forwarders/interface_with_nsm.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/no_such_method_forwarders/interface_with_nsm.dart.strong.transformed.expect @@ -27,7 +27,7 @@ abstract class _A&Object&M extends core::Object implements self::M { } class A extends self::_A&Object&M implements self::I { synthetic constructor •() → self::A - : super core::Object::•() + : super self::_A&Object&M::•() ; no-such-method-forwarder method foo() → void return this.{self::M::noSuchMethod}(new core::_InvocationMirror::_withType(#foo, 0, const [], const [], core::Map::unmodifiable(const {}))); @@ -41,7 +41,7 @@ abstract class _B&Object&M extends core::Object implements self::M { } class B extends self::_B&Object&M implements self::I { synthetic constructor •() → self::B - : super core::Object::•() + : super self::_B&Object&M::•() ; no-such-method-forwarder method foo() → void return this.{self::M::noSuchMethod}(new core::_InvocationMirror::_withType(#foo, 0, const [], const [], core::Map::unmodifiable(const {}))); diff --git a/pkg/front_end/testcases/no_such_method_forwarders/nsm_mixed_in.dart.legacy.expect b/pkg/front_end/testcases/no_such_method_forwarders/nsm_mixed_in.dart.legacy.expect index 3155d8f0f15..5b8657cdeeb 100644 --- a/pkg/front_end/testcases/no_such_method_forwarders/nsm_mixed_in.dart.legacy.expect +++ b/pkg/front_end/testcases/no_such_method_forwarders/nsm_mixed_in.dart.legacy.expect @@ -17,7 +17,7 @@ abstract class _B&Object&A = core::Object with self::A { } class B extends self::_B&Object&A { synthetic constructor •() → self::B - : super core::Object::•() + : super self::_B&Object&A::•() ; no-such-method-forwarder method foo() → void return this.{self::A::noSuchMethod}(new core::_InvocationMirror::_withType(#foo, 0, const [], const [], core::Map::unmodifiable(const {}))); diff --git a/pkg/front_end/testcases/no_such_method_forwarders/nsm_mixed_in.dart.legacy.transformed.expect b/pkg/front_end/testcases/no_such_method_forwarders/nsm_mixed_in.dart.legacy.transformed.expect index d91cc25e259..f8720a61230 100644 --- a/pkg/front_end/testcases/no_such_method_forwarders/nsm_mixed_in.dart.legacy.transformed.expect +++ b/pkg/front_end/testcases/no_such_method_forwarders/nsm_mixed_in.dart.legacy.transformed.expect @@ -20,7 +20,7 @@ abstract class _B&Object&A extends core::Object implements self::A { } class B extends self::_B&Object&A { synthetic constructor •() → self::B - : super core::Object::•() + : super self::_B&Object&A::•() ; no-such-method-forwarder method foo() → void return this.{self::A::noSuchMethod}(new core::_InvocationMirror::_withType(#foo, 0, const [], const [], core::Map::unmodifiable(const {}))); diff --git a/pkg/front_end/testcases/no_such_method_forwarders/nsm_mixed_in.dart.strong.expect b/pkg/front_end/testcases/no_such_method_forwarders/nsm_mixed_in.dart.strong.expect index 3155d8f0f15..5b8657cdeeb 100644 --- a/pkg/front_end/testcases/no_such_method_forwarders/nsm_mixed_in.dart.strong.expect +++ b/pkg/front_end/testcases/no_such_method_forwarders/nsm_mixed_in.dart.strong.expect @@ -17,7 +17,7 @@ abstract class _B&Object&A = core::Object with self::A { } class B extends self::_B&Object&A { synthetic constructor •() → self::B - : super core::Object::•() + : super self::_B&Object&A::•() ; no-such-method-forwarder method foo() → void return this.{self::A::noSuchMethod}(new core::_InvocationMirror::_withType(#foo, 0, const [], const [], core::Map::unmodifiable(const {}))); diff --git a/pkg/front_end/testcases/no_such_method_forwarders/nsm_mixed_in.dart.strong.transformed.expect b/pkg/front_end/testcases/no_such_method_forwarders/nsm_mixed_in.dart.strong.transformed.expect index d91cc25e259..f8720a61230 100644 --- a/pkg/front_end/testcases/no_such_method_forwarders/nsm_mixed_in.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/no_such_method_forwarders/nsm_mixed_in.dart.strong.transformed.expect @@ -20,7 +20,7 @@ abstract class _B&Object&A extends core::Object implements self::A { } class B extends self::_B&Object&A { synthetic constructor •() → self::B - : super core::Object::•() + : super self::_B&Object&A::•() ; no-such-method-forwarder method foo() → void return this.{self::A::noSuchMethod}(new core::_InvocationMirror::_withType(#foo, 0, const [], const [], core::Map::unmodifiable(const {}))); diff --git a/pkg/front_end/testcases/no_such_method_forwarders/subst_on_forwarder.dart.legacy.expect b/pkg/front_end/testcases/no_such_method_forwarders/subst_on_forwarder.dart.legacy.expect index 0e43ba4c444..7e77cf6df73 100644 --- a/pkg/front_end/testcases/no_such_method_forwarders/subst_on_forwarder.dart.legacy.expect +++ b/pkg/front_end/testcases/no_such_method_forwarders/subst_on_forwarder.dart.legacy.expect @@ -23,7 +23,7 @@ abstract class _A&Object&M = core::Object with self::M { } class A extends self::_A&Object&M implements self::I { synthetic constructor •() → self::A - : super core::Object::•() + : super self::_A&Object&M::•() ; no-such-method-forwarder method foo() → core::int return this.{self::M::noSuchMethod}(new core::_InvocationMirror::_withType(#foo, 0, const [], const [], core::Map::unmodifiable(const {}))) as{TypeError} core::int; diff --git a/pkg/front_end/testcases/no_such_method_forwarders/subst_on_forwarder.dart.legacy.transformed.expect b/pkg/front_end/testcases/no_such_method_forwarders/subst_on_forwarder.dart.legacy.transformed.expect index 047bcf362fd..a02303e6aa2 100644 --- a/pkg/front_end/testcases/no_such_method_forwarders/subst_on_forwarder.dart.legacy.transformed.expect +++ b/pkg/front_end/testcases/no_such_method_forwarders/subst_on_forwarder.dart.legacy.transformed.expect @@ -26,7 +26,7 @@ abstract class _A&Object&M extends core::Object implements self::M { } class A extends self::_A&Object&M implements self::I { synthetic constructor •() → self::A - : super core::Object::•() + : super self::_A&Object&M::•() ; no-such-method-forwarder method foo() → core::int return this.{self::M::noSuchMethod}(new core::_InvocationMirror::_withType(#foo, 0, const [], const [], core::Map::unmodifiable(const {}))) as{TypeError} core::int; diff --git a/pkg/front_end/testcases/no_such_method_forwarders/subst_on_forwarder.dart.strong.expect b/pkg/front_end/testcases/no_such_method_forwarders/subst_on_forwarder.dart.strong.expect index 0e43ba4c444..7e77cf6df73 100644 --- a/pkg/front_end/testcases/no_such_method_forwarders/subst_on_forwarder.dart.strong.expect +++ b/pkg/front_end/testcases/no_such_method_forwarders/subst_on_forwarder.dart.strong.expect @@ -23,7 +23,7 @@ abstract class _A&Object&M = core::Object with self::M { } class A extends self::_A&Object&M implements self::I { synthetic constructor •() → self::A - : super core::Object::•() + : super self::_A&Object&M::•() ; no-such-method-forwarder method foo() → core::int return this.{self::M::noSuchMethod}(new core::_InvocationMirror::_withType(#foo, 0, const [], const [], core::Map::unmodifiable(const {}))) as{TypeError} core::int; diff --git a/pkg/front_end/testcases/no_such_method_forwarders/subst_on_forwarder.dart.strong.transformed.expect b/pkg/front_end/testcases/no_such_method_forwarders/subst_on_forwarder.dart.strong.transformed.expect index 047bcf362fd..a02303e6aa2 100644 --- a/pkg/front_end/testcases/no_such_method_forwarders/subst_on_forwarder.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/no_such_method_forwarders/subst_on_forwarder.dart.strong.transformed.expect @@ -26,7 +26,7 @@ abstract class _A&Object&M extends core::Object implements self::M { } class A extends self::_A&Object&M implements self::I { synthetic constructor •() → self::A - : super core::Object::•() + : super self::_A&Object&M::•() ; no-such-method-forwarder method foo() → core::int return this.{self::M::noSuchMethod}(new core::_InvocationMirror::_withType(#foo, 0, const [], const [], core::Map::unmodifiable(const {}))) as{TypeError} core::int; diff --git a/pkg/front_end/testcases/qualified.dart.legacy.expect b/pkg/front_end/testcases/qualified.dart.legacy.expect index cf5f61317c0..a54701cd30d 100644 --- a/pkg/front_end/testcases/qualified.dart.legacy.expect +++ b/pkg/front_end/testcases/qualified.dart.legacy.expect @@ -49,7 +49,7 @@ abstract class _WithMixin&Supertype&Mixin = lib::Supertype with lib::Mixin { } class WithMixin extends self::_WithMixin&Supertype&Mixin { synthetic constructor •() → self::WithMixin - : super lib::Supertype::•() + : super self::_WithMixin&Supertype&Mixin::•() ; } class IllegalSupertype extends core::Object { diff --git a/pkg/front_end/testcases/qualified.dart.legacy.transformed.expect b/pkg/front_end/testcases/qualified.dart.legacy.transformed.expect index 020e7a3a1c2..20d9d186b41 100644 --- a/pkg/front_end/testcases/qualified.dart.legacy.transformed.expect +++ b/pkg/front_end/testcases/qualified.dart.legacy.transformed.expect @@ -31,7 +31,7 @@ abstract class _WithMixin&Supertype&Mixin extends lib::Supertype implements lib: } class WithMixin extends self::_WithMixin&Supertype&Mixin { synthetic constructor •() → self::WithMixin - : super lib::Supertype::•() + : super self::_WithMixin&Supertype&Mixin::•() ; } class IllegalSupertype extends core::Object { diff --git a/pkg/front_end/testcases/qualified.dart.strong.expect b/pkg/front_end/testcases/qualified.dart.strong.expect index f36c31512b7..4ad22bd958d 100644 --- a/pkg/front_end/testcases/qualified.dart.strong.expect +++ b/pkg/front_end/testcases/qualified.dart.strong.expect @@ -53,7 +53,7 @@ abstract class _WithMixin&Supertype&Mixin = lib::Supertype with lib::Mixin { } class WithMixin extends self::_WithMixin&Supertype&Mixin { synthetic constructor •() → self::WithMixin - : super lib::Supertype::•() + : super self::_WithMixin&Supertype&Mixin::•() ; } class IllegalSupertype extends core::Object { diff --git a/pkg/front_end/testcases/qualified.dart.strong.transformed.expect b/pkg/front_end/testcases/qualified.dart.strong.transformed.expect index c067a3612f4..937b2a44641 100644 --- a/pkg/front_end/testcases/qualified.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/qualified.dart.strong.transformed.expect @@ -35,7 +35,7 @@ abstract class _WithMixin&Supertype&Mixin extends lib::Supertype implements lib: } class WithMixin extends self::_WithMixin&Supertype&Mixin { synthetic constructor •() → self::WithMixin - : super lib::Supertype::•() + : super self::_WithMixin&Supertype&Mixin::•() ; } class IllegalSupertype extends core::Object { diff --git a/pkg/front_end/testcases/rasta/duplicated_mixin.dart.legacy.expect b/pkg/front_end/testcases/rasta/duplicated_mixin.dart.legacy.expect index cb6cde60695..7bfef12ec49 100644 --- a/pkg/front_end/testcases/rasta/duplicated_mixin.dart.legacy.expect +++ b/pkg/front_end/testcases/rasta/duplicated_mixin.dart.legacy.expect @@ -20,6 +20,6 @@ abstract class _A&Object&Mixin&Mixin = self::_A&Object&Mixin with self::Mixin { } class A extends self::_A&Object&Mixin&Mixin { synthetic constructor •() → self::A - : super core::Object::•() + : super self::_A&Object&Mixin&Mixin::•() ; } diff --git a/pkg/front_end/testcases/rasta/duplicated_mixin.dart.legacy.transformed.expect b/pkg/front_end/testcases/rasta/duplicated_mixin.dart.legacy.transformed.expect index d3c872e323f..25d8b4176f0 100644 --- a/pkg/front_end/testcases/rasta/duplicated_mixin.dart.legacy.transformed.expect +++ b/pkg/front_end/testcases/rasta/duplicated_mixin.dart.legacy.transformed.expect @@ -22,6 +22,6 @@ abstract class _A&Object&Mixin&Mixin extends self::_A&Object&Mixin implements se } class A extends self::_A&Object&Mixin&Mixin { synthetic constructor •() → self::A - : super core::Object::•() + : super self::_A&Object&Mixin&Mixin::•() ; } diff --git a/pkg/front_end/testcases/rasta/duplicated_mixin.dart.strong.expect b/pkg/front_end/testcases/rasta/duplicated_mixin.dart.strong.expect index cb6cde60695..7bfef12ec49 100644 --- a/pkg/front_end/testcases/rasta/duplicated_mixin.dart.strong.expect +++ b/pkg/front_end/testcases/rasta/duplicated_mixin.dart.strong.expect @@ -20,6 +20,6 @@ abstract class _A&Object&Mixin&Mixin = self::_A&Object&Mixin with self::Mixin { } class A extends self::_A&Object&Mixin&Mixin { synthetic constructor •() → self::A - : super core::Object::•() + : super self::_A&Object&Mixin&Mixin::•() ; } diff --git a/pkg/front_end/testcases/rasta/duplicated_mixin.dart.strong.transformed.expect b/pkg/front_end/testcases/rasta/duplicated_mixin.dart.strong.transformed.expect index d3c872e323f..25d8b4176f0 100644 --- a/pkg/front_end/testcases/rasta/duplicated_mixin.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/rasta/duplicated_mixin.dart.strong.transformed.expect @@ -22,6 +22,6 @@ abstract class _A&Object&Mixin&Mixin extends self::_A&Object&Mixin implements se } class A extends self::_A&Object&Mixin&Mixin { synthetic constructor •() → self::A - : super core::Object::•() + : super self::_A&Object&Mixin&Mixin::•() ; } diff --git a/pkg/front_end/testcases/rasta/issue_000007.dart.legacy.expect b/pkg/front_end/testcases/rasta/issue_000007.dart.legacy.expect index a293cd74473..16d9699ac01 100644 --- a/pkg/front_end/testcases/rasta/issue_000007.dart.legacy.expect +++ b/pkg/front_end/testcases/rasta/issue_000007.dart.legacy.expect @@ -21,7 +21,7 @@ abstract class _Sub&Base&Mixin = self::Base with self::Mixin { } class Sub extends self::_Sub&Base&Mixin { synthetic constructor •() → self::Sub - : super self::Base::•() + : super self::_Sub&Base&Mixin::•() ; } static method main() → dynamic { diff --git a/pkg/front_end/testcases/rasta/issue_000007.dart.legacy.transformed.expect b/pkg/front_end/testcases/rasta/issue_000007.dart.legacy.transformed.expect index 7fb281431e3..c528ee0ce36 100644 --- a/pkg/front_end/testcases/rasta/issue_000007.dart.legacy.transformed.expect +++ b/pkg/front_end/testcases/rasta/issue_000007.dart.legacy.transformed.expect @@ -23,7 +23,7 @@ abstract class _Sub&Base&Mixin extends self::Base implements self::Mixin { } class Sub extends self::_Sub&Base&Mixin { synthetic constructor •() → self::Sub - : super self::Base::•() + : super self::_Sub&Base&Mixin::•() ; } static method main() → dynamic { diff --git a/pkg/front_end/testcases/rasta/issue_000007.dart.strong.expect b/pkg/front_end/testcases/rasta/issue_000007.dart.strong.expect index 11c3766e99a..2df31da0073 100644 --- a/pkg/front_end/testcases/rasta/issue_000007.dart.strong.expect +++ b/pkg/front_end/testcases/rasta/issue_000007.dart.strong.expect @@ -21,7 +21,7 @@ abstract class _Sub&Base&Mixin = self::Base with self::Mixin { } class Sub extends self::_Sub&Base&Mixin { synthetic constructor •() → self::Sub - : super self::Base::•() + : super self::_Sub&Base&Mixin::•() ; } static method main() → dynamic { diff --git a/pkg/front_end/testcases/rasta/issue_000007.dart.strong.transformed.expect b/pkg/front_end/testcases/rasta/issue_000007.dart.strong.transformed.expect index 162a19df7fc..70c6e401fec 100644 --- a/pkg/front_end/testcases/rasta/issue_000007.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/rasta/issue_000007.dart.strong.transformed.expect @@ -23,7 +23,7 @@ abstract class _Sub&Base&Mixin extends self::Base implements self::Mixin { } class Sub extends self::_Sub&Base&Mixin { synthetic constructor •() → self::Sub - : super self::Base::•() + : super self::_Sub&Base&Mixin::•() ; } static method main() → dynamic { diff --git a/pkg/front_end/testcases/rasta/issue_000080.dart.legacy.expect b/pkg/front_end/testcases/rasta/issue_000080.dart.legacy.expect index 5a311d6d44e..3a5b2537869 100644 --- a/pkg/front_end/testcases/rasta/issue_000080.dart.legacy.expect +++ b/pkg/front_end/testcases/rasta/issue_000080.dart.legacy.expect @@ -17,7 +17,7 @@ abstract class _Foo&Object&Mixin = core::Object with self::Mixin { } class Foo extends self::_Foo&Object&Mixin { synthetic constructor •() → self::Foo - : super core::Object::•() + : super self::_Foo&Object&Mixin::•() ; method foo() → dynamic return super.{self::Mixin::foo}(); diff --git a/pkg/front_end/testcases/rasta/issue_000080.dart.legacy.transformed.expect b/pkg/front_end/testcases/rasta/issue_000080.dart.legacy.transformed.expect index 8d9ceb4622e..290a349850f 100644 --- a/pkg/front_end/testcases/rasta/issue_000080.dart.legacy.transformed.expect +++ b/pkg/front_end/testcases/rasta/issue_000080.dart.legacy.transformed.expect @@ -20,7 +20,7 @@ abstract class _Foo&Object&Mixin extends core::Object implements self::Mixin { } class Foo extends self::_Foo&Object&Mixin { synthetic constructor •() → self::Foo - : super core::Object::•() + : super self::_Foo&Object&Mixin::•() ; method foo() → dynamic return super.{self::Mixin::foo}(); diff --git a/pkg/front_end/testcases/rasta/issue_000080.dart.strong.expect b/pkg/front_end/testcases/rasta/issue_000080.dart.strong.expect index f37485fcad9..b02764322af 100644 --- a/pkg/front_end/testcases/rasta/issue_000080.dart.strong.expect +++ b/pkg/front_end/testcases/rasta/issue_000080.dart.strong.expect @@ -17,7 +17,7 @@ abstract class _Foo&Object&Mixin = core::Object with self::Mixin { } class Foo extends self::_Foo&Object&Mixin { synthetic constructor •() → self::Foo - : super core::Object::•() + : super self::_Foo&Object&Mixin::•() ; method foo() → dynamic return super.{self::Mixin::foo}(); diff --git a/pkg/front_end/testcases/rasta/issue_000080.dart.strong.transformed.expect b/pkg/front_end/testcases/rasta/issue_000080.dart.strong.transformed.expect index b2db9629248..060831f910d 100644 --- a/pkg/front_end/testcases/rasta/issue_000080.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/rasta/issue_000080.dart.strong.transformed.expect @@ -20,7 +20,7 @@ abstract class _Foo&Object&Mixin extends core::Object implements self::Mixin { } class Foo extends self::_Foo&Object&Mixin { synthetic constructor •() → self::Foo - : super core::Object::•() + : super self::_Foo&Object&Mixin::•() ; method foo() → dynamic return super.{self::Mixin::foo}(); diff --git a/pkg/front_end/testcases/rasta/super_mixin.dart.legacy.expect b/pkg/front_end/testcases/rasta/super_mixin.dart.legacy.expect index 8b75a6e3598..5aca9d31467 100644 --- a/pkg/front_end/testcases/rasta/super_mixin.dart.legacy.expect +++ b/pkg/front_end/testcases/rasta/super_mixin.dart.legacy.expect @@ -25,7 +25,7 @@ abstract class _C&Super&Mixin = self::Super extends self::_C&Super&Mixin { synthetic constructor •() → self::C - : super self::Super::•() + : super self::_C&Super&Mixin::•() ; } abstract class _D&Super&Mixin = self::Super with mix::Mixin { @@ -35,7 +35,7 @@ abstract class _D&Super&Mixin = self::Super with mix::Mixin { } class D extends self::_D&Super&Mixin { synthetic constructor •() → self::D - : super self::Super::•() + : super self::_D&Super&Mixin::•() ; } class C2 = self::Super with mix::Mixin { diff --git a/pkg/front_end/testcases/rasta/super_mixin.dart.legacy.transformed.expect b/pkg/front_end/testcases/rasta/super_mixin.dart.legacy.transformed.expect index 22054066d37..97f3b5a11b8 100644 --- a/pkg/front_end/testcases/rasta/super_mixin.dart.legacy.transformed.expect +++ b/pkg/front_end/testcases/rasta/super_mixin.dart.legacy.transformed.expect @@ -35,7 +35,7 @@ abstract class _C&Super&Mixin extends self::Su } class C extends self::_C&Super&Mixin { synthetic constructor •() → self::C - : super self::Super::•() + : super self::_C&Super&Mixin::•() ; } abstract class _D&Super&Mixin extends self::Super implements mix::Mixin { @@ -61,7 +61,7 @@ abstract class _D&Super&Mixin extends self::Super implements mix::Mixin } class D extends self::_D&Super&Mixin { synthetic constructor •() → self::D - : super self::Super::•() + : super self::_D&Super&Mixin::•() ; } class C2 extends self::Super implements mix::Mixin { diff --git a/pkg/front_end/testcases/rasta/super_mixin.dart.strong.expect b/pkg/front_end/testcases/rasta/super_mixin.dart.strong.expect index 77780b3953e..ac00fc51ffe 100644 --- a/pkg/front_end/testcases/rasta/super_mixin.dart.strong.expect +++ b/pkg/front_end/testcases/rasta/super_mixin.dart.strong.expect @@ -31,7 +31,7 @@ abstract class _C&Super&Mixin = self::Super extends self::_C&Super&Mixin { synthetic constructor •() → self::C - : super self::Super::•() + : super self::_C&Super&Mixin::•() ; } abstract class _D&Super&Mixin = self::Super with mix::Mixin { @@ -41,7 +41,7 @@ abstract class _D&Super&Mixin = self::Super with mix::Mixin { } class D extends self::_D&Super&Mixin { synthetic constructor •() → self::D - : super self::Super::•() + : super self::_D&Super&Mixin::•() ; } class C2 = self::Super with mix::Mixin { diff --git a/pkg/front_end/testcases/regress/issue_32182.dart.legacy.expect b/pkg/front_end/testcases/regress/issue_32182.dart.legacy.expect index 3f9071ff02c..2b0e26e57bc 100644 --- a/pkg/front_end/testcases/regress/issue_32182.dart.legacy.expect +++ b/pkg/front_end/testcases/regress/issue_32182.dart.legacy.expect @@ -21,7 +21,7 @@ abstract class _C&A&M = self::A> with self::M { } class C extends self::_C&A&M { synthetic constructor •() → self::C - : super self::A::•() + : super self::_C&A&M::•() ; } static method main() → dynamic { diff --git a/pkg/front_end/testcases/regress/issue_32182.dart.legacy.transformed.expect b/pkg/front_end/testcases/regress/issue_32182.dart.legacy.transformed.expect index 49ef1147352..a9c10f4cca6 100644 --- a/pkg/front_end/testcases/regress/issue_32182.dart.legacy.transformed.expect +++ b/pkg/front_end/testcases/regress/issue_32182.dart.legacy.transformed.expect @@ -23,7 +23,7 @@ abstract class _C&A&M extends self::A> implements self::M { } class C extends self::_C&A&M { synthetic constructor •() → self::C - : super self::A::•() + : super self::_C&A&M::•() ; } static method main() → dynamic { diff --git a/pkg/front_end/testcases/regress/issue_32182.dart.strong.expect b/pkg/front_end/testcases/regress/issue_32182.dart.strong.expect index 369e4649296..ccec30cec6e 100644 --- a/pkg/front_end/testcases/regress/issue_32182.dart.strong.expect +++ b/pkg/front_end/testcases/regress/issue_32182.dart.strong.expect @@ -21,7 +21,7 @@ abstract class _C&A&M = self::A> with self::M { } class C extends self::_C&A&M { synthetic constructor •() → self::C - : super self::A::•() + : super self::_C&A&M::•() ; } static method main() → dynamic { diff --git a/pkg/front_end/testcases/regress/issue_32182.dart.strong.transformed.expect b/pkg/front_end/testcases/regress/issue_32182.dart.strong.transformed.expect index 43a28a06bb9..063d09c5e1c 100644 --- a/pkg/front_end/testcases/regress/issue_32182.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/regress/issue_32182.dart.strong.transformed.expect @@ -23,7 +23,7 @@ abstract class _C&A&M extends self::A> implements self::M { } class C extends self::_C&A&M { synthetic constructor •() → self::C - : super self::A::•() + : super self::_C&A&M::•() ; } static method main() → dynamic { diff --git a/pkg/front_end/testcases/runtime_checks_new/mixin_forwarding_stub_getter.dart.legacy.expect b/pkg/front_end/testcases/runtime_checks_new/mixin_forwarding_stub_getter.dart.legacy.expect index dc8bb3de91d..0546d0e447a 100644 --- a/pkg/front_end/testcases/runtime_checks_new/mixin_forwarding_stub_getter.dart.legacy.expect +++ b/pkg/front_end/testcases/runtime_checks_new/mixin_forwarding_stub_getter.dart.legacy.expect @@ -39,7 +39,7 @@ abstract class C = self::B with self::M<(self: } class D extends self::C { synthetic constructor •() → self::D - : super self::B::•() + : super self::C::•() ; method f() → (core::int) → void return (core::int i) → dynamic { diff --git a/pkg/front_end/testcases/runtime_checks_new/mixin_forwarding_stub_getter.dart.legacy.transformed.expect b/pkg/front_end/testcases/runtime_checks_new/mixin_forwarding_stub_getter.dart.legacy.transformed.expect index f47ed24f1af..839a7dc7097 100644 --- a/pkg/front_end/testcases/runtime_checks_new/mixin_forwarding_stub_getter.dart.legacy.transformed.expect +++ b/pkg/front_end/testcases/runtime_checks_new/mixin_forwarding_stub_getter.dart.legacy.transformed.expect @@ -45,7 +45,7 @@ abstract class C extends self::B implements se } class D extends self::C { synthetic constructor •() → self::D - : super self::B::•() + : super self::C::•() ; method f() → (core::int) → void return (core::int i) → dynamic { diff --git a/pkg/front_end/testcases/runtime_checks_new/mixin_forwarding_stub_getter.dart.strong.expect b/pkg/front_end/testcases/runtime_checks_new/mixin_forwarding_stub_getter.dart.strong.expect index a31d746e04d..45084df3998 100644 --- a/pkg/front_end/testcases/runtime_checks_new/mixin_forwarding_stub_getter.dart.strong.expect +++ b/pkg/front_end/testcases/runtime_checks_new/mixin_forwarding_stub_getter.dart.strong.expect @@ -59,7 +59,7 @@ abstract class C = self::B with self::M<(self: } class D extends self::C { synthetic constructor •() → self::D - : super self::B::•() + : super self::C::•() ; method f() → (core::int) → void return (core::int i) → core::Null { diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/invalidation_new_class2.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/invalidation_new_class2.dart.expect index 9324ab6e95a..dedf79288d9 100644 --- a/pkg/vm/testcases/transformations/type_flow/transformer/invalidation_new_class2.dart.expect +++ b/pkg/vm/testcases/transformations/type_flow/transformer/invalidation_new_class2.dart.expect @@ -39,7 +39,7 @@ abstract class _E&D&C extends self::D implements self::C { } class E extends self::_E&D&C { synthetic constructor •() → self::E - : super self::D::•() + : super self::_E&D&C::•() ; [@vm.procedure-attributes.metadata=hasDynamicUses:false,hasThisUses:false,hasTearOffUses:false] method foo() → dynamic return new self::T2::•();