@@ -178,26 +178,25 @@ final class CallWithArguments extends CallReference {
178178 });
179179
180180 @override
181- Reference _canonicalizeChildren (CanonicalizationContext context) =>
182- CallWithArguments (
183- loadingUnits: loadingUnits
184- .map ((u) => context.canonicalizeLoadingUnit (u))
185- .toList (),
186- receiver: receiver != null
187- ? context.canonicalizeConstant (receiver! )
188- : null ,
189- positionalArguments: positionalArguments
190- .map ((c) => context.canonicalizeConstant (c))
191- .toList (),
192- namedArguments: Map .fromEntries (
193- namedArguments.entries.map (
194- (e) => MapEntry (
195- e.key,
196- context.canonicalizeConstant (e.value),
197- ),
198- ),
199- ),
200- );
181+ Reference _canonicalizeChildren (CanonicalizationContext context) {
182+ final sortedNamedArgs = namedArguments.entries.toList ()
183+ ..sort ((a, b) => a.key.compareTo (b.key));
184+ return CallWithArguments (
185+ loadingUnits: [
186+ for (final u in loadingUnits) context.canonicalizeLoadingUnit (u),
187+ ],
188+ receiver: receiver != null
189+ ? context.canonicalizeConstant (receiver! )
190+ : null ,
191+ positionalArguments: [
192+ for (final c in positionalArguments) context.canonicalizeConstant (c),
193+ ],
194+ namedArguments: {
195+ for (final e in sortedNamedArgs)
196+ e.key: context.canonicalizeConstant (e.value),
197+ },
198+ );
199+ }
201200
202201 @override
203202 WithArgumentsCallSyntax _toSyntax (SerializationContext context) {
@@ -207,15 +206,16 @@ final class CallWithArguments extends CallReference {
207206 }
208207
209208 return WithArgumentsCallSyntax (
210- loadingUnitIndices: loadingUnits
211- . map (( unit) => context.loadingUnits[unit]! )
212- . toList () ,
209+ loadingUnitIndices: [
210+ for ( final unit in loadingUnits) context.loadingUnits[unit]! ,
211+ ] ,
213212 named: namedArgs.isNotEmpty ? namedArgs : null ,
214213 positional: positionalArguments.isEmpty
215214 ? null
216- : positionalArguments
217- .map ((argument) => context.constants[argument]! )
218- .toList (),
215+ : [
216+ for (final argument in positionalArguments)
217+ context.constants[argument]! ,
218+ ],
219219 receiver: receiver != null ? context.constants[receiver! ] : null ,
220220 );
221221 }
@@ -326,9 +326,9 @@ final class CallTearoff extends CallReference {
326326 @override
327327 Reference _canonicalizeChildren (CanonicalizationContext context) =>
328328 CallTearoff (
329- loadingUnits: loadingUnits
330- . map ((u) => context.canonicalizeLoadingUnit (u))
331- . toList () ,
329+ loadingUnits: [
330+ for ( final u in loadingUnits) context.canonicalizeLoadingUnit (u),
331+ ] ,
332332 receiver: receiver != null
333333 ? context.canonicalizeConstant (receiver! )
334334 : null ,
@@ -337,9 +337,9 @@ final class CallTearoff extends CallReference {
337337 @override
338338 TearoffCallSyntax _toSyntax (SerializationContext context) =>
339339 TearoffCallSyntax (
340- loadingUnitIndices: loadingUnits
341- . map (( unit) => context.loadingUnits[unit]! )
342- . toList () ,
340+ loadingUnitIndices: [
341+ for ( final unit in loadingUnits) context.loadingUnits[unit]! ,
342+ ] ,
343343 receiver: receiver != null ? context.constants[receiver! ] : null ,
344344 );
345345
@@ -459,9 +459,9 @@ final class InstanceConstantReference extends InstanceReference {
459459 @override
460460 Reference _canonicalizeChildren (CanonicalizationContext context) =>
461461 InstanceConstantReference (
462- loadingUnits: loadingUnits
463- . map ((u) => context.canonicalizeLoadingUnit (u))
464- . toList () ,
462+ loadingUnits: [
463+ for ( final u in loadingUnits) context.canonicalizeLoadingUnit (u),
464+ ] ,
465465 instanceConstant:
466466 context.canonicalizeConstant (instanceConstant) as Constant ,
467467 );
@@ -470,9 +470,9 @@ final class InstanceConstantReference extends InstanceReference {
470470 ConstantInstanceSyntax _toSyntax (SerializationContext context) =>
471471 ConstantInstanceSyntax (
472472 constantIndex: context.constants[instanceConstant]! ,
473- loadingUnitIndices: loadingUnits
474- . map (( unit) => context.loadingUnits[unit]! )
475- . toList () ,
473+ loadingUnitIndices: [
474+ for ( final unit in loadingUnits) context.loadingUnits[unit]! ,
475+ ] ,
476476 );
477477
478478 @override
@@ -534,23 +534,22 @@ final class InstanceCreationReference extends InstanceReference {
534534 });
535535
536536 @override
537- Reference _canonicalizeChildren (CanonicalizationContext context) =>
538- InstanceCreationReference (
539- loadingUnits: loadingUnits
540- .map ((u) => context.canonicalizeLoadingUnit (u))
541- .toList (),
542- positionalArguments: positionalArguments
543- .map ((c) => context.canonicalizeConstant (c))
544- .toList (),
545- namedArguments: Map .fromEntries (
546- namedArguments.entries.map (
547- (e) => MapEntry (
548- e.key,
549- context.canonicalizeConstant (e.value),
550- ),
551- ),
552- ),
553- );
537+ Reference _canonicalizeChildren (CanonicalizationContext context) {
538+ final sortedNamedArgs = namedArguments.entries.toList ()
539+ ..sort ((a, b) => a.key.compareTo (b.key));
540+ return InstanceCreationReference (
541+ loadingUnits: [
542+ for (final u in loadingUnits) context.canonicalizeLoadingUnit (u),
543+ ],
544+ positionalArguments: [
545+ for (final c in positionalArguments) context.canonicalizeConstant (c),
546+ ],
547+ namedArguments: {
548+ for (final e in sortedNamedArgs)
549+ e.key: context.canonicalizeConstant (e.value),
550+ },
551+ );
552+ }
554553
555554 @override
556555 CreationInstanceSyntax _toSyntax (SerializationContext context) {
@@ -560,15 +559,16 @@ final class InstanceCreationReference extends InstanceReference {
560559 }
561560
562561 return CreationInstanceSyntax (
563- loadingUnitIndices: loadingUnits
564- . map (( unit) => context.loadingUnits[unit]! )
565- . toList () ,
562+ loadingUnitIndices: [
563+ for ( final unit in loadingUnits) context.loadingUnits[unit]! ,
564+ ] ,
566565 named: namedArgs.isNotEmpty ? namedArgs : null ,
567566 positional: positionalArguments.isEmpty
568567 ? null
569- : positionalArguments
570- .map ((argument) => context.constants[argument]! )
571- .toList (),
568+ : [
569+ for (final argument in positionalArguments)
570+ context.constants[argument]! ,
571+ ],
572572 );
573573 }
574574
@@ -664,17 +664,17 @@ final class ConstructorTearoffReference extends InstanceReference {
664664 @override
665665 Reference _canonicalizeChildren (CanonicalizationContext context) =>
666666 ConstructorTearoffReference (
667- loadingUnits: loadingUnits
668- . map ((u) => context.canonicalizeLoadingUnit (u))
669- . toList () ,
667+ loadingUnits: [
668+ for ( final u in loadingUnits) context.canonicalizeLoadingUnit (u),
669+ ] ,
670670 );
671671
672672 @override
673673 TearoffInstanceSyntax _toSyntax (SerializationContext context) =>
674674 TearoffInstanceSyntax (
675- loadingUnitIndices: loadingUnits
676- . map (( unit) => context.loadingUnits[unit]! )
677- . toList () ,
675+ loadingUnitIndices: [
676+ for ( final unit in loadingUnits) context.loadingUnits[unit]! ,
677+ ] ,
678678 );
679679
680680 @override
0 commit comments