Skip to content

Commit d0a2219

Browse files
chloestefantsovaCommit Queue
chloestefantsova
authored and
Commit Queue
committed
[cfe] Enable 'getter-setter-error' flag in CFE unit tests
Change-Id: I7f7201a26e1ce1b9ba7afab0cb4e56827de76194 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/397162 Reviewed-by: Johnni Winther <[email protected]> Commit-Queue: Chloe Stefantsova <[email protected]>
1 parent 88dc829 commit d0a2219

File tree

184 files changed

+2103
-3094
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

184 files changed

+2103
-3094
lines changed

‎pkg/front_end/lib/src/type_inference/inference_visitor.dart‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11591,9 +11591,7 @@ class InferenceVisitorImpl extends InferenceVisitorBase
1159111591

1159211592
node.containsKeyTarget = containsKeyTarget.classMember as Procedure;
1159311593
node.containsKeyType =
11594-
containsKeyTarget
11595-
.getFunctionType(this)
11596-
.containsKeyFunctionType;
11594+
containsKeyTarget.getFunctionType(this).containsKeyFunctionType;
1159711595

1159811596
ObjectAccessTarget indexGetTarget = findInterfaceMember(
1159911597
lookupType, indexGetName, node.fileOffset,
@@ -11602,9 +11600,7 @@ class InferenceVisitorImpl extends InferenceVisitorBase
1160211600

1160311601
node.indexGetTarget = indexGetTarget.classMember as Procedure;
1160411602
node.indexGetType =
11605-
indexGetTarget
11606-
.getFunctionType(this)
11607-
.indexGetFunctionType;
11603+
indexGetTarget.getFunctionType(this).indexGetFunctionType;
1160811604
}
1160911605

1161011606
assert(checkStack(node, stackBase, [

‎pkg/front_end/test/coverage_suite_expected.dart‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,7 @@ const Map<String, ({int hitCount, int missCount})> _expect = {
670670
),
671671
// 100.0%.
672672
"package:front_end/src/kernel/hierarchy/members_node.dart": (
673-
hitCount: 1163,
673+
hitCount: 1167,
674674
missCount: 0,
675675
),
676676
// 100.0%.
@@ -905,7 +905,7 @@ const Map<String, ({int hitCount, int missCount})> _expect = {
905905
),
906906
// 100.0%.
907907
"package:front_end/src/source/source_enum_builder.dart": (
908-
hitCount: 515,
908+
hitCount: 517,
909909
missCount: 0,
910910
),
911911
// 100.0%.
@@ -936,7 +936,7 @@ const Map<String, ({int hitCount, int missCount})> _expect = {
936936
),
937937
// 100.0%.
938938
"package:front_end/src/source/source_library_builder.dart": (
939-
hitCount: 1344,
939+
hitCount: 1347,
940940
missCount: 0,
941941
),
942942
// 100.0%.
@@ -1001,7 +1001,7 @@ const Map<String, ({int hitCount, int missCount})> _expect = {
10011001
),
10021002
// 100.0%.
10031003
"package:front_end/src/type_inference/inference_visitor.dart": (
1004-
hitCount: 8249,
1004+
hitCount: 8254,
10051005
missCount: 0,
10061006
),
10071007
// 100.0%.
@@ -1016,7 +1016,7 @@ const Map<String, ({int hitCount, int missCount})> _expect = {
10161016
),
10171017
// 100.0%.
10181018
"package:front_end/src/type_inference/matching_expressions.dart": (
1019-
hitCount: 519,
1019+
hitCount: 521,
10201020
missCount: 0,
10211021
),
10221022
// 100.0%.

‎pkg/front_end/test/testing/folder_options.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ class SuiteFolderOptions {
135135
// Force enable features in development.
136136
ExperimentalFlag.nullAwareElements: true,
137137
ExperimentalFlag.inferenceUsingBounds: true,
138+
ExperimentalFlag.getterSetterError: true,
138139
};
139140

140141
void addForcedExperimentalFlag(String name, ExperimentalFlag flag) {

‎pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart.strong.expect‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ abstract class _B&Object&Error = core::Object with core::Error /*isAnonymousMixi
3737
synthetic constructor •() → self::_B&Object&Error
3838
: super core::Object::•()
3939
;
40+
mixin-super-stub get stackTrace() → core::StackTrace?
41+
return super.{core::Error::stackTrace};
4042
mixin-super-stub get _stackTrace() → core::StackTrace?
4143
return super.{core::Error::_stackTrace};
4244
mixin-super-stub set _stackTrace(core::StackTrace? value) → void
4345
return super.{core::Error::_stackTrace} = value;
44-
mixin-super-stub get stackTrace() → core::StackTrace?
45-
return super.{core::Error::stackTrace};
4646
}
4747
class B extends self::_B&Object&Error {
4848
synthetic constructor •() → self::B

‎pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart.strong.modular.expect‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ abstract class _B&Object&Error = core::Object with core::Error /*isAnonymousMixi
3737
synthetic constructor •() → self::_B&Object&Error
3838
: super core::Object::•()
3939
;
40+
mixin-super-stub get stackTrace() → core::StackTrace?
41+
return super.{core::Error::stackTrace};
4042
mixin-super-stub get _stackTrace() → core::StackTrace?
4143
return super.{core::Error::_stackTrace};
4244
mixin-super-stub set _stackTrace(core::StackTrace? value) → void
4345
return super.{core::Error::_stackTrace} = value;
44-
mixin-super-stub get stackTrace() → core::StackTrace?
45-
return super.{core::Error::stackTrace};
4646
}
4747
class B extends self::_B&Object&Error {
4848
synthetic constructor •() → self::B

‎pkg/front_end/testcases/class_modifiers/mixin/mixin_class_core_libraries.dart.strong.outline.expect‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ abstract class _B&Object&Error = core::Object with core::Error /*isAnonymousMixi
3636
synthetic constructor •() → self::_B&Object&Error
3737
: super core::Object::•()
3838
;
39+
mixin-super-stub get stackTrace() → core::StackTrace?
40+
return super.{core::Error::stackTrace};
3941
mixin-super-stub get _stackTrace() → core::StackTrace?
4042
return super.{core::Error::_stackTrace};
4143
mixin-super-stub set _stackTrace(core::StackTrace? value) → void
4244
return super.{core::Error::_stackTrace} = value;
43-
mixin-super-stub get stackTrace() → core::StackTrace?
44-
return super.{core::Error::stackTrace};
4545
}
4646
class B extends self::_B&Object&Error {
4747
synthetic constructor •() → self::B

‎pkg/front_end/testcases/dart2js/generic_usage_type_variable.dart.strong.expect‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ class C1 extends core::Object implements self::C {
4545
return this.{self::C1::noSuchMethod}(core::_createInvocationMirror("v6", <dynamic>[], <dynamic>[], #C3, 1)){(core::Invocation) → dynamic} as{TypeError,ForDynamic} core::List<dynamic>;
4646
no-such-method-forwarder set v6(core::List<dynamic> value) → void
4747
return this.{self::C1::noSuchMethod}(core::_createInvocationMirror("v6=", <dynamic>[], <dynamic>[value], #C3, 2)){(core::Invocation) → dynamic};
48-
no-such-method-forwarder get g() → FutureOr<FutureOr<void>>
49-
return this.{self::C1::noSuchMethod}(core::_createInvocationMirror("g", <dynamic>[], <dynamic>[], #C3, 1)){(core::Invocation) → dynamic} as{TypeError,ForDynamic} FutureOr<FutureOr<void>>;
50-
no-such-method-forwarder set g(FutureOr<FutureOr<void>>value) → void
51-
return this.{self::C1::noSuchMethod}(core::_createInvocationMirror("g=", <dynamic>[], <dynamic>[value], #C3, 2)){(core::Invocation) → dynamic};
5248
no-such-method-forwarder get v7() → Null
5349
return this.{self::C1::noSuchMethod}(core::_createInvocationMirror("v7", <dynamic>[], <dynamic>[], #C3, 1)){(core::Invocation) → dynamic} as{TypeError,ForDynamic} Null;
5450
no-such-method-forwarder operator +(core::double other) → core::double
5551
return this.{self::C1::noSuchMethod}(core::_createInvocationMirror("+", <dynamic>[], <dynamic>[other], #C3, 0)){(core::Invocation) → dynamic} as{TypeError,ForDynamic} core::double;
52+
no-such-method-forwarder get g() → FutureOr<FutureOr<void>>
53+
return this.{self::C1::noSuchMethod}(core::_createInvocationMirror("g", <dynamic>[], <dynamic>[], #C3, 1)){(core::Invocation) → dynamic} as{TypeError,ForDynamic} FutureOr<FutureOr<void>>;
54+
no-such-method-forwarder set g(FutureOr<FutureOr<void>>value) → void
55+
return this.{self::C1::noSuchMethod}(core::_createInvocationMirror("g=", <dynamic>[], <dynamic>[value], #C3, 2)){(core::Invocation) → dynamic};
5656
no-such-method-forwarder method /* signature-type: (self::C, [core::Set<core::Set<self::C>>]) → core::Map<self::C, self::C> */ m1(covariant-by-declaration self::C arg1, [core::Set<core::Set<self::C>>? arg2 = #C2]) → core::Map<self::C, self::C>
5757
return this.{self::C1::noSuchMethod}(core::_createInvocationMirror("m1", <dynamic>[], <dynamic>[arg1, arg2], #C3, 0)){(core::Invocation) → dynamic} as{TypeError,ForDynamic} core::Map<self::C, self::C>;
5858
no-such-method-forwarder method /* signature-type: ({arg1: dynamic, arg2: ((dynamic) → dynamic, dynamic) → core::Map<dynamic, dynamic>}) → void */ m2({dynamic arg1 = #C2, ((dynamic) → dynamic, dynamic) →? core::Map<dynamic, dynamic> arg2 = #C2}) → void

‎pkg/front_end/testcases/dart2js/generic_usage_type_variable.dart.strong.modular.expect‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ class C1 extends core::Object implements self::C {
4545
return this.{self::C1::noSuchMethod}(core::_createInvocationMirror("v6", <dynamic>[], <dynamic>[], #C3, 1)){(core::Invocation) → dynamic} as{TypeError,ForDynamic} core::List<dynamic>;
4646
no-such-method-forwarder set v6(core::List<dynamic> value) → void
4747
return this.{self::C1::noSuchMethod}(core::_createInvocationMirror("v6=", <dynamic>[], <dynamic>[value], #C3, 2)){(core::Invocation) → dynamic};
48-
no-such-method-forwarder get g() → FutureOr<FutureOr<void>>
49-
return this.{self::C1::noSuchMethod}(core::_createInvocationMirror("g", <dynamic>[], <dynamic>[], #C3, 1)){(core::Invocation) → dynamic} as{TypeError,ForDynamic} FutureOr<FutureOr<void>>;
50-
no-such-method-forwarder set g(FutureOr<FutureOr<void>>value) → void
51-
return this.{self::C1::noSuchMethod}(core::_createInvocationMirror("g=", <dynamic>[], <dynamic>[value], #C3, 2)){(core::Invocation) → dynamic};
5248
no-such-method-forwarder get v7() → Null
5349
return this.{self::C1::noSuchMethod}(core::_createInvocationMirror("v7", <dynamic>[], <dynamic>[], #C3, 1)){(core::Invocation) → dynamic} as{TypeError,ForDynamic} Null;
5450
no-such-method-forwarder operator +(core::double other) → core::double
5551
return this.{self::C1::noSuchMethod}(core::_createInvocationMirror("+", <dynamic>[], <dynamic>[other], #C3, 0)){(core::Invocation) → dynamic} as{TypeError,ForDynamic} core::double;
52+
no-such-method-forwarder get g() → FutureOr<FutureOr<void>>
53+
return this.{self::C1::noSuchMethod}(core::_createInvocationMirror("g", <dynamic>[], <dynamic>[], #C3, 1)){(core::Invocation) → dynamic} as{TypeError,ForDynamic} FutureOr<FutureOr<void>>;
54+
no-such-method-forwarder set g(FutureOr<FutureOr<void>>value) → void
55+
return this.{self::C1::noSuchMethod}(core::_createInvocationMirror("g=", <dynamic>[], <dynamic>[value], #C3, 2)){(core::Invocation) → dynamic};
5656
no-such-method-forwarder method /* signature-type: (self::C, [core::Set<core::Set<self::C>>]) → core::Map<self::C, self::C> */ m1(covariant-by-declaration self::C arg1, [core::Set<core::Set<self::C>>? arg2 = #C2]) → core::Map<self::C, self::C>
5757
return this.{self::C1::noSuchMethod}(core::_createInvocationMirror("m1", <dynamic>[], <dynamic>[arg1, arg2], #C3, 0)){(core::Invocation) → dynamic} as{TypeError,ForDynamic} core::Map<self::C, self::C>;
5858
no-such-method-forwarder method /* signature-type: ({arg1: dynamic, arg2: ((dynamic) → dynamic, dynamic) → core::Map<dynamic, dynamic>}) → void */ m2({dynamic arg1 = #C2, ((dynamic) → dynamic, dynamic) →? core::Map<dynamic, dynamic> arg2 = #C2}) → void

‎pkg/front_end/testcases/dart2js/generic_usage_type_variable.dart.strong.outline.expect‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@ class C1 extends core::Object implements self::C {
4242
return this.{self::C1::noSuchMethod}(core::_createInvocationMirror("v6", <dynamic>[], <dynamic>[], const <core::String, dynamic>{}, 1)){(core::Invocation) → dynamic} as{TypeError,ForDynamic} core::List<dynamic>;
4343
no-such-method-forwarder set v6(core::List<dynamic> value) → void
4444
return this.{self::C1::noSuchMethod}(core::_createInvocationMirror("v6=", <dynamic>[], <dynamic>[value], const <core::String, dynamic>{}, 2)){(core::Invocation) → dynamic};
45-
no-such-method-forwarder get g() → FutureOr<FutureOr<void>>
46-
return this.{self::C1::noSuchMethod}(core::_createInvocationMirror("g", <dynamic>[], <dynamic>[], const <core::String, dynamic>{}, 1)){(core::Invocation) → dynamic} as{TypeError,ForDynamic} FutureOr<FutureOr<void>>;
47-
no-such-method-forwarder set g(FutureOr<FutureOr<void>>value) → void
48-
return this.{self::C1::noSuchMethod}(core::_createInvocationMirror("g=", <dynamic>[], <dynamic>[value], const <core::String, dynamic>{}, 2)){(core::Invocation) → dynamic};
4945
no-such-method-forwarder get v7() → Null
5046
return this.{self::C1::noSuchMethod}(core::_createInvocationMirror("v7", <dynamic>[], <dynamic>[], const <core::String, dynamic>{}, 1)){(core::Invocation) → dynamic} as{TypeError,ForDynamic} Null;
5147
no-such-method-forwarder operator +(core::double other) → core::double
5248
return this.{self::C1::noSuchMethod}(core::_createInvocationMirror("+", <dynamic>[], <dynamic>[other], const <core::String, dynamic>{}, 0)){(core::Invocation) → dynamic} as{TypeError,ForDynamic} core::double;
49+
no-such-method-forwarder get g() → FutureOr<FutureOr<void>>
50+
return this.{self::C1::noSuchMethod}(core::_createInvocationMirror("g", <dynamic>[], <dynamic>[], const <core::String, dynamic>{}, 1)){(core::Invocation) → dynamic} as{TypeError,ForDynamic} FutureOr<FutureOr<void>>;
51+
no-such-method-forwarder set g(FutureOr<FutureOr<void>>value) → void
52+
return this.{self::C1::noSuchMethod}(core::_createInvocationMirror("g=", <dynamic>[], <dynamic>[value], const <core::String, dynamic>{}, 2)){(core::Invocation) → dynamic};
5353
no-such-method-forwarder method /* signature-type: (self::C, [core::Set<core::Set<self::C>>]) → core::Map<self::C, self::C> */ m1(covariant-by-declaration self::C arg1, [core::Set<core::Set<self::C>>? arg2]) → core::Map<self::C, self::C>
5454
return this.{self::C1::noSuchMethod}(core::_createInvocationMirror("m1", <dynamic>[], <dynamic>[arg1, arg2], const <core::String, dynamic>{}, 0)){(core::Invocation) → dynamic} as{TypeError,ForDynamic} core::Map<self::C, self::C>;
5555
no-such-method-forwarder method /* signature-type: ({arg1: dynamic, arg2: ((dynamic) → dynamic, dynamic) → core::Map<dynamic, dynamic>}) → void */ m2({dynamic arg1, ((dynamic) → dynamic, dynamic) →? core::Map<dynamic, dynamic> arg2}) → void

‎pkg/front_end/testcases/dart2js/generic_usage_type_variable.dart.strong.transformed.expect‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ class C1 extends core::Object implements self::C {
4545
return this.{self::C1::noSuchMethod}(core::_createInvocationMirror("v6", <dynamic>[], <dynamic>[], #C3, 1)){(core::Invocation) → dynamic} as{TypeError,ForDynamic} core::List<dynamic>;
4646
no-such-method-forwarder set v6(core::List<dynamic> value) → void
4747
return this.{self::C1::noSuchMethod}(core::_createInvocationMirror("v6=", <dynamic>[], <dynamic>[value], #C3, 2)){(core::Invocation) → dynamic};
48-
no-such-method-forwarder get g() → FutureOr<FutureOr<void>>
49-
return this.{self::C1::noSuchMethod}(core::_createInvocationMirror("g", <dynamic>[], <dynamic>[], #C3, 1)){(core::Invocation) → dynamic} as{TypeError,ForDynamic} FutureOr<FutureOr<void>>;
50-
no-such-method-forwarder set g(FutureOr<FutureOr<void>>value) → void
51-
return this.{self::C1::noSuchMethod}(core::_createInvocationMirror("g=", <dynamic>[], <dynamic>[value], #C3, 2)){(core::Invocation) → dynamic};
5248
no-such-method-forwarder get v7() → Null
5349
return this.{self::C1::noSuchMethod}(core::_createInvocationMirror("v7", <dynamic>[], <dynamic>[], #C3, 1)){(core::Invocation) → dynamic} as{TypeError,ForDynamic} Null;
5450
no-such-method-forwarder operator +(core::double other) → core::double
5551
return this.{self::C1::noSuchMethod}(core::_createInvocationMirror("+", <dynamic>[], <dynamic>[other], #C3, 0)){(core::Invocation) → dynamic} as{TypeError,ForDynamic} core::double;
52+
no-such-method-forwarder get g() → FutureOr<FutureOr<void>>
53+
return this.{self::C1::noSuchMethod}(core::_createInvocationMirror("g", <dynamic>[], <dynamic>[], #C3, 1)){(core::Invocation) → dynamic} as{TypeError,ForDynamic} FutureOr<FutureOr<void>>;
54+
no-such-method-forwarder set g(FutureOr<FutureOr<void>>value) → void
55+
return this.{self::C1::noSuchMethod}(core::_createInvocationMirror("g=", <dynamic>[], <dynamic>[value], #C3, 2)){(core::Invocation) → dynamic};
5656
no-such-method-forwarder method /* signature-type: (self::C, [core::Set<core::Set<self::C>>]) → core::Map<self::C, self::C> */ m1(covariant-by-declaration self::C arg1, [core::Set<core::Set<self::C>>? arg2 = #C2]) → core::Map<self::C, self::C>
5757
return this.{self::C1::noSuchMethod}(core::_createInvocationMirror("m1", <dynamic>[], <dynamic>[arg1, arg2], #C3, 0)){(core::Invocation) → dynamic} as{TypeError,ForDynamic} core::Map<self::C, self::C>;
5858
no-such-method-forwarder method /* signature-type: ({arg1: dynamic, arg2: ((dynamic) → dynamic, dynamic) → core::Map<dynamic, dynamic>}) → void */ m2({dynamic arg1 = #C2, ((dynamic) → dynamic, dynamic) →? core::Map<dynamic, dynamic> arg2 = #C2}) → void

0 commit comments

Comments
 (0)