File tree 2 files changed +14
-5
lines changed
2 files changed +14
-5
lines changed Original file line number Diff line number Diff line change @@ -99,6 +99,10 @@ class _KernelOrderedTypeSetBuilder extends OrderedTypeSetBuilderBase {
99
99
reporter: elementMap.reporter,
100
100
objectType: elementMap.commonElements.objectType);
101
101
102
+ // TODO(sigmund): delete once Issue #31118 is fixed.
103
+ @override
104
+ bool get reportMultiInheritanceIssue => false ;
105
+
102
106
InterfaceType getThisType (ClassEntity cls) {
103
107
return elementMap._getThisType (cls);
104
108
}
Original file line number Diff line number Diff line change @@ -228,6 +228,9 @@ abstract class OrderedTypeSetBuilderBase implements OrderedTypeSetBuilder {
228
228
}
229
229
}
230
230
231
+ // TODO(sigmund): delete once Issue #31118 is fixed.
232
+ bool get reportMultiInheritanceIssue => true ;
233
+
231
234
void _addAtDepth (InterfaceType type, int depth) {
232
235
LinkEntry <InterfaceType > prev = null ;
233
236
LinkEntry <InterfaceType > link = map[depth];
@@ -236,11 +239,13 @@ abstract class OrderedTypeSetBuilderBase implements OrderedTypeSetBuilder {
236
239
if (existingType == type) return ;
237
240
if (existingType.element == type.element) {
238
241
if (reporter != null ) {
239
- reporter.reportErrorMessage (cls, MessageKind .MULTI_INHERITANCE , {
240
- 'thisType' : getThisType (cls),
241
- 'firstType' : existingType,
242
- 'secondType' : type
243
- });
242
+ if (reportMultiInheritanceIssue) {
243
+ reporter.reportErrorMessage (cls, MessageKind .MULTI_INHERITANCE , {
244
+ 'thisType' : getThisType (cls),
245
+ 'firstType' : existingType,
246
+ 'secondType' : type
247
+ });
248
+ }
244
249
} else {
245
250
assert (false , failedAt (cls, 'Invalid ordered typeset for $cls ' ));
246
251
}
You can’t perform that action at this time.
0 commit comments