Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 6578228

Browse files
author
Dart CI
committed
Version 2.12.0-116.0.dev
Merge commit '74be6670c9b5fff68caec4112f13216031c4b0fc' into 'dev'
2 parents 1e9f997 + 74be667 commit 6578228

File tree

104 files changed

+8963
-8174
lines changed

Some content is hidden

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

104 files changed

+8963
-8174
lines changed

‎pkg/front_end/lib/src/fasta/builder/field_builder.dart‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -429,8 +429,7 @@ class SourceFieldBuilder extends MemberBuilderImpl implements FieldBuilder {
429429
// `fieldType` may have changed if a circularity was detected when
430430
// [inferredType] was computed.
431431
if (!library.isNonNullableByDefault) {
432-
inferredType = legacyErasure(
433-
library.loader.typeInferenceEngine.coreTypes, inferredType);
432+
inferredType = legacyErasure(inferredType);
434433
}
435434
fieldType = implicitFieldType.checkInferred(inferredType);
436435

‎pkg/front_end/lib/src/fasta/kernel/class_hierarchy_builder.dart‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1265,7 +1265,7 @@ class ClassHierarchyNodeBuilder {
12651265
norm(hierarchy.coreTypes, inheritedType));
12661266
}
12671267
} else {
1268-
inheritedType = legacyErasure(hierarchy.coreTypes, inheritedType);
1268+
inheritedType = legacyErasure(inheritedType);
12691269
if (inferredType == null) {
12701270
return inheritedType;
12711271
} else {
@@ -1703,8 +1703,7 @@ class ClassHierarchyNodeBuilder {
17031703
if (!classBuilder.library.isNonNullableByDefault &&
17041704
supernode.classBuilder.library.isNonNullableByDefault) {
17051705
for (int i = 0; i < superclasses.length; i++) {
1706-
superclasses[i] =
1707-
legacyErasureSupertype(hierarchy.coreTypes, superclasses[i]);
1706+
superclasses[i] = legacyErasureSupertype(superclasses[i]);
17081707
}
17091708
}
17101709

@@ -2377,7 +2376,7 @@ class ClassHierarchyNodeBuilder {
23772376
Supertype type) {
23782377
if (type == null) return null;
23792378
if (!classBuilder.library.isNonNullableByDefault) {
2380-
type = legacyErasureSupertype(hierarchy.coreTypes, type);
2379+
type = legacyErasureSupertype(type);
23812380
}
23822381
ClassHierarchyNode node = hierarchy.getNodeFromClass(type.classNode);
23832382
if (node == null) return null;

‎pkg/front_end/lib/src/fasta/kernel/combined_member_signature.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ abstract class CombinedMemberSignatureBase<T> {
301301
"No member computed for index ${index} in ${members}");
302302
candidateType = _computeMemberType(thisType, target);
303303
if (!classBuilder.library.isNonNullableByDefault) {
304-
DartType legacyErasure = rawLegacyErasure(_coreTypes, candidateType);
304+
DartType legacyErasure = rawLegacyErasure(candidateType);
305305
if (legacyErasure != null) {
306306
_neededLegacyErasureIndices ??= {};
307307
_neededLegacyErasureIndices.add(index);

‎pkg/front_end/lib/src/fasta/kernel/constant_evaluator.dart‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,6 @@ class ConstantWeakener extends ComputeOnceConstantVisitor<Constant> {
174174

175175
ConstantWeakener(this._evaluator);
176176

177-
CoreTypes get _coreTypes => _evaluator.coreTypes;
178-
179177
Constant processValue(Constant node, Constant value) {
180178
if (value != null) {
181179
value = _evaluator.canonicalize(value);
@@ -207,8 +205,8 @@ class ConstantWeakener extends ComputeOnceConstantVisitor<Constant> {
207205

208206
@override
209207
Constant visitMapConstant(MapConstant node) {
210-
DartType keyType = rawLegacyErasure(_coreTypes, node.keyType);
211-
DartType valueType = rawLegacyErasure(_coreTypes, node.valueType);
208+
DartType keyType = rawLegacyErasure(node.keyType);
209+
DartType valueType = rawLegacyErasure(node.valueType);
212210
List<ConstantMapEntry> entries;
213211
for (int index = 0; index < node.entries.length; index++) {
214212
ConstantMapEntry entry = node.entries[index];
@@ -229,7 +227,7 @@ class ConstantWeakener extends ComputeOnceConstantVisitor<Constant> {
229227

230228
@override
231229
Constant visitListConstant(ListConstant node) {
232-
DartType typeArgument = rawLegacyErasure(_coreTypes, node.typeArgument);
230+
DartType typeArgument = rawLegacyErasure(node.typeArgument);
233231
List<Constant> entries;
234232
for (int index = 0; index < node.entries.length; index++) {
235233
Constant entry = visitConstant(node.entries[index]);
@@ -247,7 +245,7 @@ class ConstantWeakener extends ComputeOnceConstantVisitor<Constant> {
247245

248246
@override
249247
Constant visitSetConstant(SetConstant node) {
250-
DartType typeArgument = rawLegacyErasure(_coreTypes, node.typeArgument);
248+
DartType typeArgument = rawLegacyErasure(node.typeArgument);
251249
List<Constant> entries;
252250
for (int index = 0; index < node.entries.length; index++) {
253251
Constant entry = visitConstant(node.entries[index]);
@@ -267,8 +265,7 @@ class ConstantWeakener extends ComputeOnceConstantVisitor<Constant> {
267265
Constant visitInstanceConstant(InstanceConstant node) {
268266
List<DartType> typeArguments;
269267
for (int index = 0; index < node.typeArguments.length; index++) {
270-
DartType typeArgument =
271-
rawLegacyErasure(_coreTypes, node.typeArguments[index]);
268+
DartType typeArgument = rawLegacyErasure(node.typeArguments[index]);
272269
if (typeArgument != null) {
273270
typeArguments ??= node.typeArguments.toList(growable: false);
274271
typeArguments[index] = typeArgument;
@@ -294,7 +291,7 @@ class ConstantWeakener extends ComputeOnceConstantVisitor<Constant> {
294291
PartialInstantiationConstant node) {
295292
List<DartType> types;
296293
for (int index = 0; index < node.types.length; index++) {
297-
DartType type = rawLegacyErasure(_coreTypes, node.types[index]);
294+
DartType type = rawLegacyErasure(node.types[index]);
298295
if (type != null) {
299296
types ??= node.types.toList(growable: false);
300297
types[index] = type;
@@ -311,7 +308,7 @@ class ConstantWeakener extends ComputeOnceConstantVisitor<Constant> {
311308

312309
@override
313310
Constant visitTypeLiteralConstant(TypeLiteralConstant node) {
314-
DartType type = rawLegacyErasure(_coreTypes, node.type);
311+
DartType type = rawLegacyErasure(node.type);
315312
if (type != null) {
316313
return new TypeLiteralConstant(type);
317314
}
@@ -840,7 +837,7 @@ class ConstantEvaluator extends RecursiveVisitor<Constant> {
840837
case EvaluationMode.agnostic:
841838
return type;
842839
case EvaluationMode.weak:
843-
return legacyErasure(coreTypes, type);
840+
return legacyErasure(type);
844841
}
845842
throw new UnsupportedError(
846843
"Unexpected evaluation mode: ${evaluationMode}.");
@@ -852,9 +849,7 @@ class ConstantEvaluator extends RecursiveVisitor<Constant> {
852849
case EvaluationMode.agnostic:
853850
return types;
854851
case EvaluationMode.weak:
855-
return types
856-
.map((DartType type) => legacyErasure(coreTypes, type))
857-
.toList();
852+
return types.map((DartType type) => legacyErasure(type)).toList();
858853
}
859854
throw new UnsupportedError(
860855
"Unexpected evaluation mode: ${evaluationMode}.");
@@ -2608,7 +2603,7 @@ class ConstantEvaluator extends RecursiveVisitor<Constant> {
26082603
bool isSubtype(Constant constant, DartType type, SubtypeCheckMode mode) {
26092604
DartType constantType = constant.getType(_staticTypeContext);
26102605
if (mode == SubtypeCheckMode.ignoringNullabilities) {
2611-
constantType = rawLegacyErasure(coreTypes, constantType) ?? constantType;
2606+
constantType = rawLegacyErasure(constantType) ?? constantType;
26122607
}
26132608
bool result = typeEnvironment.isSubtypeOf(constantType, type, mode);
26142609
if (targetingJavaScript && !result) {

‎pkg/front_end/lib/src/fasta/kernel/implicit_field_type.dart‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,7 @@ class _ImplicitFieldTypeRoot extends ImplicitFieldType {
112112
for (ImplicitFieldType overridden in _overriddenFields) {
113113
DartType overriddenType = overridden.inferType();
114114
if (!fieldBuilder.library.isNonNullableByDefault) {
115-
overriddenType = legacyErasure(
116-
fieldBuilder.library.loader.coreTypes, overriddenType);
115+
overriddenType = legacyErasure(overriddenType);
117116
}
118117
if (inferredType == null) {
119118
inferredType = overriddenType;
@@ -166,8 +165,7 @@ class _ImplicitFieldTypeRoot extends ImplicitFieldType {
166165
for (ImplicitFieldType overridden in _overriddenFields) {
167166
DartType overriddenType = overridden.inferType();
168167
if (!fieldBuilder.library.isNonNullableByDefault) {
169-
overriddenType = legacyErasure(
170-
fieldBuilder.library.loader.coreTypes, overriddenType);
168+
overriddenType = legacyErasure(overriddenType);
171169
}
172170
if (type != overriddenType) {
173171
String name = fieldBuilder.fullNameForErrors;

‎pkg/front_end/lib/src/fasta/kernel/inference_visitor.dart‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3837,7 +3837,7 @@ class InferenceVisitor
38373837
}
38383838

38393839
if (!inferrer.isNonNullableByDefault) {
3840-
binaryType = legacyErasure(inferrer.coreTypes, binaryType);
3840+
binaryType = legacyErasure(binaryType);
38413841
}
38423842

38433843
if (!inferrer.isTopLevel && binaryTarget.isNullable) {
@@ -3934,7 +3934,7 @@ class InferenceVisitor
39343934
}
39353935

39363936
if (!inferrer.isNonNullableByDefault) {
3937-
unaryType = legacyErasure(inferrer.coreTypes, unaryType);
3937+
unaryType = legacyErasure(unaryType);
39383938
}
39393939

39403940
if (!inferrer.isTopLevel && unaryTarget.isNullable) {
@@ -4022,7 +4022,7 @@ class InferenceVisitor
40224022
}
40234023

40244024
if (!inferrer.isNonNullableByDefault) {
4025-
readType = legacyErasure(inferrer.coreTypes, readType);
4025+
readType = legacyErasure(readType);
40264026
}
40274027

40284028
if (!inferrer.isTopLevel && readTarget.isNullable) {
@@ -4220,7 +4220,7 @@ class InferenceVisitor
42204220
}
42214221

42224222
if (!inferrer.isNonNullableByDefault) {
4223-
readType = legacyErasure(inferrer.coreTypes, readType);
4223+
readType = legacyErasure(readType);
42244224
}
42254225

42264226
readResult ??= new ExpressionInferenceResult(readType, read);
@@ -5275,7 +5275,7 @@ class InferenceVisitor
52755275
DartType type = target.getterType;
52765276

52775277
if (!inferrer.isNonNullableByDefault) {
5278-
type = legacyErasure(inferrer.coreTypes, type);
5278+
type = legacyErasure(type);
52795279
}
52805280

52815281
if (target is Procedure && target.kind == ProcedureKind.Method) {

0 commit comments

Comments
 (0)