Skip to content

Commit 10c03da

Browse files
johnniwinthercommit-bot@chromium.org
johnniwinther
authored and
commit-bot@chromium.org
committed
[cfe] Add regression test for issue 43864
Change-Id: Id0f6c18c5d47a1fbf234cc7c0a43abb6035a0c4a Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/168540 Commit-Queue: Johnni Winther <johnniwinther@google.com> Reviewed-by: Jens Johansen <jensj@google.com>
1 parent 0b14abc commit 10c03da

14 files changed

+577
-0
lines changed

‎pkg/front_end/testcases/nnbd_mixed/super_access/main.dart‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// Copyright (c) 2020, the Dart project authors. Please see the AUTHORS file
2+
// for details. All rights reserved. Use of this source code is governed by a
3+
// BSD-style license that can be found in the LICENSE file.
4+
5+
// @dart=2.9
6+
7+
import 'main_lib1.dart';
8+
import 'main_lib2.dart';
9+
10+
class Class<T> with Mixin1<T>, Mixin2<T> {
11+
set field(Typedef value) {
12+
super.field;
13+
super.field = value;
14+
super.method1();
15+
super.method2(null);
16+
}
17+
}
18+
19+
main() {}

‎pkg/front_end/testcases/nnbd_mixed/super_access/main.dart.textual_outline.expect‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// @dart = 2.9
2+
import 'main_lib1.dart';
3+
import 'main_lib2.dart';
4+
5+
class Class<T> with Mixin1<T>, Mixin2<T> {
6+
set field(Typedef value) {}
7+
}
8+
9+
main() {}

‎pkg/front_end/testcases/nnbd_mixed/super_access/main.dart.textual_outline_modelled.expect‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// @dart = 2.9
2+
import 'main_lib1.dart';
3+
import 'main_lib2.dart';
4+
5+
class Class<T> with Mixin1<T>, Mixin2<T> {
6+
set field(Typedef value) {}
7+
}
8+
9+
main() {}

‎pkg/front_end/testcases/nnbd_mixed/super_access/main.dart.weak.expect‎

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
library;
2+
import self as self;
3+
import "dart:core" as core;
4+
import "main_lib1.dart" as mai;
5+
import "main_lib2.dart" as mai2;
6+
7+
import "org-dartlang-testcase:///main_lib1.dart";
8+
import "org-dartlang-testcase:///main_lib2.dart";
9+
10+
abstract class _Class&Object&Mixin1<T extends core::Object* = dynamic> = core::Object with mai::Mixin1<self::_Class&Object&Mixin1::T*> /*isAnonymousMixin,hasConstConstructor*/ {
11+
const synthetic constructor •() → self::_Class&Object&Mixin1<self::_Class&Object&Mixin1::T*>*
12+
: super core::Object::•()
13+
;
14+
abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
15+
abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
16+
abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
17+
abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
18+
abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
19+
abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
20+
abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
21+
abstract member-signature method toString() → core::String*; -> core::Object::toString
22+
abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
23+
abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
24+
}
25+
abstract class _Class&Object&Mixin1&Mixin2<T extends core::Object* = dynamic> = self::_Class&Object&Mixin1<self::_Class&Object&Mixin1&Mixin2::T*> with mai::Mixin2<self::_Class&Object&Mixin1&Mixin2::T*> /*isAnonymousMixin*/ {
26+
synthetic constructor •() → self::_Class&Object&Mixin1&Mixin2<self::_Class&Object&Mixin1&Mixin2::T*>*
27+
: super self::_Class&Object&Mixin1::•()
28+
;
29+
abstract member-signature set field((dynamic) →* core::Type* _) → void; -> mai::Mixin2::field
30+
abstract member-signature get field() → (dynamic) →* core::Type*; -> mai::Mixin2::field
31+
abstract member-signature method method1() → (dynamic) →* core::Type*; -> mai::Mixin2::method1
32+
abstract member-signature method method2((dynamic) →* core::Type* t) → void; -> mai::Mixin2::method2
33+
}
34+
class Class<T extends core::Object* = dynamic> extends self::_Class&Object&Mixin1&Mixin2<self::Class::T*> {
35+
synthetic constructor •() → self::Class<self::Class::T*>*
36+
: super self::_Class&Object&Mixin1&Mixin2::•()
37+
;
38+
set field((dynamic) →* core::Type value) → void {
39+
super.{mai::Mixin2::field};
40+
super.{self::_Class&Object&Mixin1&Mixin2::field} = value;
41+
super.{mai::Mixin2::method1}();
42+
super.{mai::Mixin2::method2}(null);
43+
}
44+
}
45+
static method main() → dynamic {}
46+
47+
library;
48+
import self as mai;
49+
import "dart:core" as core;
50+
import "main_lib2.dart" as mai2;
51+
52+
import "org-dartlang-testcase:///main_lib2.dart";
53+
54+
abstract class Mixin1<T extends core::Object* = dynamic> extends core::Object implements mai2::Interface<mai2::Value<dynamic>*, core::Object*> {
55+
synthetic constructor •() → mai::Mixin1<mai::Mixin1::T*>*
56+
: super core::Object::•()
57+
;
58+
abstract member-signature set field((core::Object*) →* core::Type* _) → void; -> mai2::Interface::field
59+
abstract member-signature get field() → (core::Object*) →* core::Type*; -> mai2::Interface::field
60+
abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
61+
abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
62+
abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
63+
abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
64+
abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
65+
abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
66+
abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
67+
abstract member-signature method toString() → core::String*; -> core::Object::toString
68+
abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
69+
abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
70+
abstract member-signature method method1() → (core::Object*) →* core::Type*; -> mai2::Interface::method1
71+
abstract member-signature method method2((core::Object*) →* core::Type* t) → void; -> mai2::Interface::method2
72+
}
73+
abstract class Mixin2<T extends core::Object* = dynamic> extends core::Object implements mai2::Interface<mai2::Value<dynamic>*, core::Object*> {
74+
field (dynamic) →* core::Type field = null;
75+
synthetic constructor •() → mai::Mixin2<mai::Mixin2::T*>*
76+
: super core::Object::•()
77+
;
78+
method method1() → (dynamic) →* core::Type
79+
return null;
80+
method method2((dynamic) →* core::Type t) → void {}
81+
abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
82+
abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
83+
abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
84+
abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
85+
abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
86+
abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
87+
abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
88+
abstract member-signature method toString() → core::String*; -> core::Object::toString
89+
abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
90+
abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
91+
}
92+
93+
library /*isNonNullableByDefault*/;
94+
import self as mai2;
95+
import "dart:core" as core;
96+
97+
typedef Typedef<unrelated T extends mai2::Value<dynamic> = mai2::Value<dynamic>, contravariant I extends core::Object? = dynamic> = (I%) → core::Type;
98+
abstract class Value<T extends core::Object? = dynamic> extends core::Object {
99+
synthetic constructor •() → mai2::Value<mai2::Value::T%>
100+
: super core::Object::•()
101+
;
102+
}
103+
class Interface<T extends mai2::Value<dynamic> = mai2::Value<dynamic>, I extends core::Object? = dynamic> extends core::Object {
104+
field (mai2::Interface::I%) →? core::Type field = null;
105+
synthetic constructor •() → mai2::Interface<mai2::Interface::T, mai2::Interface::I%>
106+
: super core::Object::•()
107+
;
108+
method method1() → (mai2::Interface::I%) →? core::Type
109+
return null;
110+
method method2((mai2::Interface::I%) →? core::Type t) → void {}
111+
}

‎pkg/front_end/testcases/nnbd_mixed/super_access/main.dart.weak.transformed.expect‎

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
library;
2+
import self as self;
3+
import "dart:core" as core;
4+
import "main_lib1.dart" as mai;
5+
import "main_lib2.dart" as mai2;
6+
7+
import "org-dartlang-testcase:///main_lib1.dart";
8+
import "org-dartlang-testcase:///main_lib2.dart";
9+
10+
abstract class _Class&Object&Mixin1<T extends core::Object* = dynamic> extends core::Object implements mai::Mixin1<self::_Class&Object&Mixin1::T*> /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/ {
11+
const synthetic constructor •() → self::_Class&Object&Mixin1<self::_Class&Object&Mixin1::T*>*
12+
: super core::Object::•()
13+
;
14+
abstract member-signature get /* from org-dartlang-testcase:///main_lib1.dart */ _identityHashCode() → core::int*; -> core::Object::_identityHashCode
15+
abstract member-signature method /* from org-dartlang-testcase:///main_lib1.dart */ _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
16+
abstract member-signature method /* from org-dartlang-testcase:///main_lib1.dart */ _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
17+
abstract member-signature method /* from org-dartlang-testcase:///main_lib1.dart */ _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
18+
abstract member-signature method /* from org-dartlang-testcase:///main_lib1.dart */ _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
19+
abstract member-signature operator /* from org-dartlang-testcase:///main_lib1.dart */ ==(dynamic other) → core::bool*; -> core::Object::==
20+
abstract member-signature get /* from org-dartlang-testcase:///main_lib1.dart */ hashCode() → core::int*; -> core::Object::hashCode
21+
abstract member-signature method /* from org-dartlang-testcase:///main_lib1.dart */ toString() → core::String*; -> core::Object::toString
22+
abstract member-signature method /* from org-dartlang-testcase:///main_lib1.dart */ noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
23+
abstract member-signature get /* from org-dartlang-testcase:///main_lib1.dart */ runtimeType() → core::Type*; -> core::Object::runtimeType
24+
abstract member-signature set /* from org-dartlang-testcase:///main_lib1.dart */ field((core::Object*) →* core::Type* _) → void; -> mai2::Interface::field
25+
abstract member-signature get /* from org-dartlang-testcase:///main_lib1.dart */ field() → (core::Object*) →* core::Type*; -> mai2::Interface::field
26+
abstract member-signature method /* from org-dartlang-testcase:///main_lib1.dart */ method1() → (core::Object*) →* core::Type*; -> mai2::Interface::method1
27+
abstract member-signature method /* from org-dartlang-testcase:///main_lib1.dart */ method2((core::Object*) →* core::Type* t) → void; -> mai2::Interface::method2
28+
}
29+
abstract class _Class&Object&Mixin1&Mixin2<T extends core::Object* = dynamic> extends self::_Class&Object&Mixin1<self::_Class&Object&Mixin1&Mixin2::T*> implements mai::Mixin2<self::_Class&Object&Mixin1&Mixin2::T*> /*isAnonymousMixin,isEliminatedMixin*/ {
30+
field (dynamic) →* core::Type field = null /* from org-dartlang-testcase:///main_lib1.dart */;
31+
synthetic constructor •() → self::_Class&Object&Mixin1&Mixin2<self::_Class&Object&Mixin1&Mixin2::T*>*
32+
: super self::_Class&Object&Mixin1::•()
33+
;
34+
method /* from org-dartlang-testcase:///main_lib1.dart */ method1() → (dynamic) →* core::Type
35+
return null;
36+
method /* from org-dartlang-testcase:///main_lib1.dart */ method2((dynamic) →* core::Type t) → void {}
37+
abstract member-signature get /* from org-dartlang-testcase:///main_lib1.dart */ _identityHashCode() → core::int*; -> core::Object::_identityHashCode
38+
abstract member-signature method /* from org-dartlang-testcase:///main_lib1.dart */ _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
39+
abstract member-signature method /* from org-dartlang-testcase:///main_lib1.dart */ _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
40+
abstract member-signature method /* from org-dartlang-testcase:///main_lib1.dart */ _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
41+
abstract member-signature method /* from org-dartlang-testcase:///main_lib1.dart */ _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
42+
abstract member-signature operator /* from org-dartlang-testcase:///main_lib1.dart */ ==(dynamic other) → core::bool*; -> core::Object::==
43+
abstract member-signature get /* from org-dartlang-testcase:///main_lib1.dart */ hashCode() → core::int*; -> core::Object::hashCode
44+
abstract member-signature method /* from org-dartlang-testcase:///main_lib1.dart */ toString() → core::String*; -> core::Object::toString
45+
abstract member-signature method /* from org-dartlang-testcase:///main_lib1.dart */ noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
46+
abstract member-signature get /* from org-dartlang-testcase:///main_lib1.dart */ runtimeType() → core::Type*; -> core::Object::runtimeType
47+
}
48+
class Class<T extends core::Object* = dynamic> extends self::_Class&Object&Mixin1&Mixin2<self::Class::T*> {
49+
synthetic constructor •() → self::Class<self::Class::T*>*
50+
: super self::_Class&Object&Mixin1&Mixin2::•()
51+
;
52+
set field((dynamic) →* core::Type value) → void {
53+
super.{mai::Mixin2::field};
54+
super.{self::_Class&Object&Mixin1&Mixin2::field} = value;
55+
super.{mai::Mixin2::method1}();
56+
super.{mai::Mixin2::method2}(null);
57+
}
58+
}
59+
static method main() → dynamic {}
60+
61+
library;
62+
import self as mai;
63+
import "dart:core" as core;
64+
import "main_lib2.dart" as mai2;
65+
66+
import "org-dartlang-testcase:///main_lib2.dart";
67+
68+
abstract class Mixin1<T extends core::Object* = dynamic> extends core::Object implements mai2::Interface<mai2::Value<dynamic>*, core::Object*> {
69+
synthetic constructor •() → mai::Mixin1<mai::Mixin1::T*>*
70+
: super core::Object::•()
71+
;
72+
abstract member-signature set field((core::Object*) →* core::Type* _) → void; -> mai2::Interface::field
73+
abstract member-signature get field() → (core::Object*) →* core::Type*; -> mai2::Interface::field
74+
abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
75+
abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
76+
abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
77+
abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
78+
abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
79+
abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
80+
abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
81+
abstract member-signature method toString() → core::String*; -> core::Object::toString
82+
abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
83+
abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
84+
abstract member-signature method method1() → (core::Object*) →* core::Type*; -> mai2::Interface::method1
85+
abstract member-signature method method2((core::Object*) →* core::Type* t) → void; -> mai2::Interface::method2
86+
}
87+
abstract class Mixin2<T extends core::Object* = dynamic> extends core::Object implements mai2::Interface<mai2::Value<dynamic>*, core::Object*> {
88+
field (dynamic) →* core::Type field = null;
89+
synthetic constructor •() → mai::Mixin2<mai::Mixin2::T*>*
90+
: super core::Object::•()
91+
;
92+
method method1() → (dynamic) →* core::Type
93+
return null;
94+
method method2((dynamic) →* core::Type t) → void {}
95+
abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
96+
abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
97+
abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
98+
abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
99+
abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
100+
abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
101+
abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
102+
abstract member-signature method toString() → core::String*; -> core::Object::toString
103+
abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
104+
abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
105+
}
106+
107+
library /*isNonNullableByDefault*/;
108+
import self as mai2;
109+
import "dart:core" as core;
110+
111+
typedef Typedef<unrelated T extends mai2::Value<dynamic> = mai2::Value<dynamic>, contravariant I extends core::Object? = dynamic> = (I%) → core::Type;
112+
abstract class Value<T extends core::Object? = dynamic> extends core::Object {
113+
synthetic constructor •() → mai2::Value<mai2::Value::T%>
114+
: super core::Object::•()
115+
;
116+
}
117+
class Interface<T extends mai2::Value<dynamic> = mai2::Value<dynamic>, I extends core::Object? = dynamic> extends core::Object {
118+
field (mai2::Interface::I%) →? core::Type field = null;
119+
synthetic constructor •() → mai2::Interface<mai2::Interface::T, mai2::Interface::I%>
120+
: super core::Object::•()
121+
;
122+
method method1() → (mai2::Interface::I%) →? core::Type
123+
return null;
124+
method method2((mai2::Interface::I%) →? core::Type t) → void {}
125+
}

‎pkg/front_end/testcases/nnbd_mixed/super_access/main.no_link.dart‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// Copyright (c) 2020, the Dart project authors. Please see the AUTHORS file
2+
// for details. All rights reserved. Use of this source code is governed by a
3+
// BSD-style license that can be found in the LICENSE file.
4+
5+
// @dart=2.9
6+
7+
import 'main_lib1.dart';
8+
import 'main_lib2.dart';
9+
10+
class Class<T> with Mixin1<T>, Mixin2<T> {
11+
set field(Typedef value) {
12+
super.field;
13+
super.field = value;
14+
super.method1();
15+
super.method2(null);
16+
}
17+
}
18+
19+
main() {}

‎pkg/front_end/testcases/nnbd_mixed/super_access/main.no_link.dart.textual_outline.expect‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// @dart = 2.9
2+
import 'main_lib1.dart';
3+
import 'main_lib2.dart';
4+
5+
class Class<T> with Mixin1<T>, Mixin2<T> {
6+
set field(Typedef value) {}
7+
}
8+
9+
main() {}

‎pkg/front_end/testcases/nnbd_mixed/super_access/main.no_link.dart.textual_outline_modelled.expect‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// @dart = 2.9
2+
import 'main_lib1.dart';
3+
import 'main_lib2.dart';
4+
5+
class Class<T> with Mixin1<T>, Mixin2<T> {
6+
set field(Typedef value) {}
7+
}
8+
9+
main() {}

0 commit comments

Comments
 (0)