[CFE] Remove ~19 mb of allocations caused by iterators etc

jensjoha · Commit Queue · commit 84e279d27968 · 2025-07-04T05:59:12.000-07:00
* Remove ~2.8mb of iterators in SourceMethodBuilder * Remove ~0.7mb of iterators in calculateBounds * Remove ~1.7 mb of iterators in ClassMembersNodeBuilder.build * Remove ~1.9mb of iterators in BuilderFactory.computeBuildersByName * Remove ~3mb of iterables and iterators in findRecordUseAnnotation * Remove ~3mb of allocations from List.iterator in InferenceVisitorBase._inferInvocation * Another ~6.3mb of iterables in various places in chunks of ~100-800kb. Running a benchmark of the CFE compiling the CFE I get this: ``` msec task-clock:u: -5.9719% +/- 0.3845% (-342.77 +/- 22.07) (5739.61 -> 5396.84) page-faults:u: -2.6307% +/- 0.0630% (-2951.12 +/- 70.63) (112178.18 -> 109227.06) cycles:u: -6.1751% +/- 0.3921% (-1471343183.50 +/- 93434420.74) (23827045867.84 -> 22355702684.34) instructions:u: -5.0116% +/- 0.0006% (-1385443477.90 +/- 176957.44) (27644543467.86 -> 26259099989.96) branch-misses:u: -6.0357% +/- 1.7661% (-5562845.14 +/- 1627775.60) (92165665.40 -> 86602820.26) seconds time elapsed: -5.9868% +/- 0.3830% (-0.34 +/- 0.02) (5.75 -> 5.40) seconds user: -6.0365% +/- 0.4515% (-0.33 +/- 0.02) (5.47 -> 5.14) seconds sys: -4.6542% +/- 3.6415% (-0.01 +/- 0.01) (0.27 -> 0.26) Scavenge( new space) goes from 64 to 63 MarkSweep( promotion) goes from 9 to 8 Evacuate(store buffer) goes from 2 to 1 ``` Worth noticing, though, is that the before numbers (e.g. 5739.61 ms task-clock:u) is very close to the before numbers from https://dart-review.googlesource.com/c/sdk/+/438681 (5767.31 ms) and not the after numbers on that cl (5478.56 ms) --- so something weird is going on here. Change-Id: I67248bbde47900435ababcb1a2d5ecff2dde5c13 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/438722 Reviewed-by: Johnni Winther <johnniwinther@google.com> Commit-Queue: Jens Johansen <jensj@google.com>
diff --git a/pkg/front_end/lib/src/fragment/constructor/declaration.dart b/pkg/front_end/lib/src/fragment/constructor/declaration.dart
@@ -138,7 +138,9 @@ mixin _ConstructorDeclarationMixin
   @override
   FormalParameterBuilder? getFormal(Identifier identifier) {
     if (formals != null) {
-      for (FormalParameterBuilder formal in formals!) {
+      List<FormalParameterBuilder> formals = this.formals!;
+      for (int i = 0; i < formals.length; i++) {
+        FormalParameterBuilder formal = formals[i];
         if (formal.isWildcard &&
             identifier.name == '_' &&
             formal.fileOffset == identifier.nameOffset) {
diff --git a/pkg/front_end/lib/src/fragment/method/encoding.dart b/pkg/front_end/lib/src/fragment/method/encoding.dart
@@ -254,7 +254,8 @@ mixin _DirectMethodEncodingMixin implements MethodEncoding {
       return new FormalParameterScope(parent: parent);
     }
     Map<String, VariableBuilder> local = {};
-    for (FormalParameterBuilder formal in formals) {
+    for (int i = 0; i < formals.length; i++) {
+      FormalParameterBuilder formal = formals[i];
       if (formal.isWildcard) {
         continue;
       }
@@ -270,7 +271,8 @@ mixin _DirectMethodEncodingMixin implements MethodEncoding {
         .build(libraryBuilder, TypeUse.returnType, hierarchy: hierarchy);
     List<FormalParameterBuilder>? declaredFormals = _fragment.declaredFormals;
     if (declaredFormals != null) {
-      for (FormalParameterBuilder formal in declaredFormals) {
+      for (int i = 0; i < declaredFormals.length; i++) {
+        FormalParameterBuilder formal = declaredFormals[i];
         formal.type
             .build(libraryBuilder, TypeUse.parameterType, hierarchy: hierarchy);
       }
diff --git a/pkg/front_end/lib/src/fragment/util.dart b/pkg/front_end/lib/src/fragment/util.dart
@@ -81,7 +81,8 @@ void buildFormalsForOutlineExpressions(
     {required LookupScope scope,
     required bool isClassInstanceMember}) {
   if (formals != null) {
-    for (FormalParameterBuilder formal in formals) {
+    for (int i = 0; i < formals.length; i++) {
+      FormalParameterBuilder formal = formals[i];
       buildFormalForOutlineExpressions(
           libraryBuilder, declarationBuilder, formal,
           scope: scope, isClassInstanceMember: isClassInstanceMember);
diff --git a/pkg/front_end/lib/src/kernel/body_builder.dart b/pkg/front_end/lib/src/kernel/body_builder.dart
@@ -6251,7 +6251,8 @@ class BodyBuilder extends StackListenerImpl
     if (named.isNotEmpty) {
       Set<String?> parameterNames =
           new Set.of(function.namedParameters.map((a) => a.name));
-      for (NamedExpression argument in named) {
+      for (int i = 0; i < named.length; i++) {
+        NamedExpression argument = named[i];
         if (!parameterNames.contains(argument.name)) {
           return cfe.templateNoSuchNamedParameter
               .withArguments(argument.name)
@@ -6261,7 +6262,8 @@ class BodyBuilder extends StackListenerImpl
     }
     if (function.namedParameters.isNotEmpty) {
       Set<String> argumentNames = new Set.of(named.map((a) => a.name));
-      for (VariableDeclaration parameter in function.namedParameters) {
+      for (int i = 0; i < function.namedParameters.length; i++) {
+        VariableDeclaration parameter = function.namedParameters[i];
         if (parameter.isRequired && !argumentNames.contains(parameter.name)) {
           return cfe.templateValueForRequiredParameterNotProvidedError
               .withArguments(parameter.name!)
@@ -6321,7 +6323,8 @@ class BodyBuilder extends StackListenerImpl
     if (named.isNotEmpty) {
       Set<String> names =
           new Set.of(function.namedParameters.map((a) => a.name));
-      for (NamedExpression argument in named) {
+      for (int i = 0; i < named.length; i++) {
+        NamedExpression argument = named[i];
         if (!names.contains(argument.name)) {
           return cfe.templateNoSuchNamedParameter
               .withArguments(argument.name)
@@ -6331,7 +6334,8 @@ class BodyBuilder extends StackListenerImpl
     }
     if (function.namedParameters.isNotEmpty) {
       Set<String> argumentNames = new Set.of(named.map((a) => a.name));
-      for (NamedType parameter in function.namedParameters) {
+      for (int i = 0; i < function.namedParameters.length; i++) {
+        NamedType parameter = function.namedParameters[i];
         if (parameter.isRequired && !argumentNames.contains(parameter.name)) {
           return cfe.templateValueForRequiredParameterNotProvidedError
               .withArguments(parameter.name)
diff --git a/pkg/front_end/lib/src/kernel/body_builder_context.dart b/pkg/front_end/lib/src/kernel/body_builder_context.dart
@@ -125,7 +125,9 @@ abstract class BodyBuilderContext {
   /// member whose body is being built.
   FormalParameterBuilder? getFormalParameterByName(Identifier identifier) {
     if (formals != null) {
-      for (FormalParameterBuilder formal in formals!) {
+      List<FormalParameterBuilder> formals = this.formals!;
+      for (int i = 0; i < formals.length; i++) {
+        FormalParameterBuilder formal = formals[i];
         if (formal.isWildcard &&
             identifier.name == '_' &&
             formal.fileOffset == identifier.nameOffset) {
diff --git a/pkg/front_end/lib/src/kernel/constant_evaluator.dart b/pkg/front_end/lib/src/kernel/constant_evaluator.dart
@@ -2737,7 +2737,8 @@ class ConstantEvaluator implements ExpressionVisitor<Constant> {
     // We therefore reset it before each call, combine it and set it correctly
     // at the end.
     bool wasOrBecameUnevaluated = seenUnevaluatedChild;
-    for (Expression element in node.expressions) {
+    for (int i = 0; i < node.expressions.length; i++) {
+      Expression element = node.expressions[i];
       seenUnevaluatedChild = false;
       AbortConstant? error = builder.add(element);
       wasOrBecameUnevaluated |= seenUnevaluatedChild;
@@ -4965,7 +4966,8 @@ class ConstantEvaluator implements ExpressionVisitor<Constant> {
     // We therefore reset it before each call, combine it and set it correctly
     // at the end.
     bool wasOrBecameUnevaluated = seenUnevaluatedChild;
-    for (NamedExpression pair in named) {
+    for (int i = 0; i < named.length; i++) {
+      NamedExpression pair = named[i];
       if (_gotError != null) return null;
       seenUnevaluatedChild = false;
       Constant constant = _evaluateSubexpression(pair.value);
diff --git a/pkg/front_end/lib/src/kernel/hierarchy/members_node.dart b/pkg/front_end/lib/src/kernel/hierarchy/members_node.dart
@@ -584,7 +584,9 @@ class ClassMembersNodeBuilder extends MembersNodeBuilder {
         classBuilder.filteredMembersIterator(includeDuplicates: false);
     while (iterator.moveNext()) {
       MemberBuilder memberBuilder = iterator.current;
-      for (ClassMember classMember in memberBuilder.localMembers) {
+      List<ClassMember> localMembers = memberBuilder.localMembers;
+      for (int i = 0; i < localMembers.length; i++) {
+        ClassMember classMember = localMembers[i];
         Name name = classMember.name;
         if (classMember.isAbstract) {
           _hasInterfaces = true;
@@ -601,7 +603,9 @@ class ClassMembersNodeBuilder extends MembersNodeBuilder {
           userNoSuchMethodMember = classMember;
         }
       }
-      for (ClassMember classMember in memberBuilder.localSetters) {
+      List<ClassMember> localSetters = memberBuilder.localSetters;
+      for (int i = 0; i < localSetters.length; i++) {
+        ClassMember classMember = localSetters[i];
         Name name = classMember.name;
         if (classMember.isAbstract) {
           _hasInterfaces = true;
@@ -632,7 +636,9 @@ class ClassMembersNodeBuilder extends MembersNodeBuilder {
           if (memberBuilder.isStatic) {
             continue;
           }
-          for (ClassMember classMember in memberBuilder.localMembers) {
+          List<ClassMember> localMembers = memberBuilder.localMembers;
+          for (int i = 0; i < localMembers.length; i++) {
+            ClassMember classMember = localMembers[i];
             Name name = classMember.name;
             if (classMember.isAbstract || classMember.isNoSuchMethodForwarder) {
               _hasInterfaces = true;
@@ -649,7 +655,9 @@ class ClassMembersNodeBuilder extends MembersNodeBuilder {
               userNoSuchMethodMember ??= classMember;
             }
           }
-          for (ClassMember classMember in memberBuilder.localSetters) {
+          List<ClassMember> localSetters = memberBuilder.localSetters;
+          for (int i = 0; i < localSetters.length; i++) {
+            ClassMember classMember = localSetters[i];
             Name name = classMember.name;
             if (classMember.isAbstract || classMember.isNoSuchMethodForwarder) {
               _hasInterfaces = true;
diff --git a/pkg/front_end/lib/src/kernel/invalid_type.dart b/pkg/front_end/lib/src/kernel/invalid_type.dart
@@ -45,7 +45,8 @@ class _InvalidTypeFinder implements DartTypeVisitor1<bool, Set<TypedefType>> {
   @override
   bool visitInterfaceType(
       InterfaceType node, Set<TypedefType> visitedTypedefs) {
-    for (DartType typeArgument in node.typeArguments) {
+    for (int i = 0; i < node.typeArguments.length; i++) {
+      DartType typeArgument = node.typeArguments[i];
       if (typeArgument.accept1(this, visitedTypedefs)) return true;
     }
     return false;
diff --git a/pkg/front_end/lib/src/kernel/record_use.dart b/pkg/front_end/lib/src/kernel/record_use.dart
@@ -14,12 +14,19 @@ import 'constant_evaluator.dart' show ErrorReporter;
 
 /// Get all of the `@RecordUse` annotations from `package:meta`
 /// that are attached to the specified [node].
-Iterable<InstanceConstant> findRecordUseAnnotation(Annotatable node) =>
-    node.annotations
-        .whereType<ConstantExpression>()
-        .map((expression) => expression.constant)
-        .whereType<InstanceConstant>()
-        .where((instance) => isRecordUse(instance.classNode));
+Iterable<InstanceConstant> findRecordUseAnnotation(Annotatable node) {
+  List<InstanceConstant>? result;
+  for (int i = 0; i < node.annotations.length; i++) {
+    Expression annotation = node.annotations[i];
+    if (annotation is! ConstantExpression) continue;
+    Constant constant = annotation.constant;
+    if (constant is! InstanceConstant) continue;
+    if (!isRecordUse(constant.classNode)) continue;
+    // Coverage-ignore-block(suite): Not run.
+    (result ??= []).add(constant);
+  }
+  return result ?? const [];
+}
 
 // Coverage-ignore(suite): Not run.
 bool hasRecordUseAnnotation(Annotatable node) =>
diff --git a/pkg/front_end/lib/src/kernel/static_weak_references.dart b/pkg/front_end/lib/src/kernel/static_weak_references.dart
@@ -29,7 +29,9 @@ class StaticWeakReferences {
 
   static bool isAnnotatedWithWeakReferencePragma(
       Annotatable node, CoreTypes coreTypes) {
-    for (Expression annotation in node.annotations) {
+    List<Expression> annotations = node.annotations;
+    for (int i = 0; i < annotations.length; i++) {
+      Expression annotation = annotations[i];
       if (annotation is ConstantExpression) {
         Constant constant = annotation.constant;
         if (constant is InstanceConstant) {
diff --git a/pkg/front_end/lib/src/kernel/type_algorithms.dart b/pkg/front_end/lib/src/kernel/type_algorithms.dart
@@ -891,7 +891,8 @@ class ComputeDefaultTypeContext {
   void reportGenericFunctionTypesForFormals(
       List<FormalParameterBuilder>? formals) {
     if (formals != null && formals.isNotEmpty) {
-      for (FormalParameterBuilder formal in formals) {
+      for (int i = 0; i < formals.length; i++) {
+        FormalParameterBuilder formal = formals[i];
         List<NonSimplicityIssue> issues =
             _getInboundReferenceIssuesInType(formal.type);
         _reportIssues(issues);
diff --git a/pkg/front_end/lib/src/source/builder_factory.dart b/pkg/front_end/lib/src/source/builder_factory.dart
@@ -149,7 +149,8 @@ class BuilderFactory {
     }
 
     if (fragments != null) {
-      for (Fragment fragment in fragments) {
+      for (int i = 0; i < fragments.length; i++) {
+        Fragment fragment = fragments[i];
         _Declaration? declaration = _createDeclarationFromFragment(fragment,
             inLibrary: _inLibrary, unnamedFragments: unnamedFragments);
 
@@ -158,13 +159,16 @@ class BuilderFactory {
       }
     }
 
-    for (_PreBuilder preBuilder in nonConstructorPreBuilders) {
+    for (int i = 0; i < nonConstructorPreBuilders.length; i++) {
+      _PreBuilder preBuilder = nonConstructorPreBuilders[i];
       preBuilder.createBuilders(this);
     }
-    for (_PreBuilder preBuilder in constructorPreBuilders) {
+    for (int i = 0; i < constructorPreBuilders.length; i++) {
+      _PreBuilder preBuilder = constructorPreBuilders[i];
       preBuilder.createBuilders(this);
     }
-    for (Fragment fragment in unnamedFragments) {
+    for (int i = 0; i < unnamedFragments.length; i++) {
+      Fragment fragment = unnamedFragments[i];
       _createBuilder(fragment);
     }
   }
diff --git a/pkg/front_end/lib/src/source/source_class_builder.dart b/pkg/front_end/lib/src/source/source_class_builder.dart
@@ -203,7 +203,8 @@ class SourceClassBuilder extends ClassBuilderImpl
   @override
   int resolveConstructors(SourceLibraryBuilder libraryBuilder) {
     int count = _introductory.resolveConstructorReferences(libraryBuilder);
-    for (ClassDeclaration augmentation in _augmentations) {
+    for (int i = 0; i < _augmentations.length; i++) {
+      ClassDeclaration augmentation = _augmentations[i];
       count += augmentation.resolveConstructorReferences(libraryBuilder);
     }
     if (count > 0) {
@@ -534,7 +535,8 @@ class SourceClassBuilder extends ClassBuilderImpl
         libraryBuilder: libraryBuilder,
         classHierarchy: classHierarchy,
         createFileUriExpression: false);
-    for (ClassDeclaration augmentation in _augmentations) {
+    for (int i = 0; i < _augmentations.length; i++) {
+      ClassDeclaration augmentation = _augmentations[i];
       augmentation.buildOutlineExpressions(
           annotatable: cls,
           annotatableFileUri: cls.fileUri,
@@ -579,7 +581,8 @@ class SourceClassBuilder extends ClassBuilderImpl
 
     Class? superclass = cls.superclass;
     if (superclass != null) {
-      for (Constructor constructor in superclass.constructors) {
+      for (int i = 0; i < superclass.constructors.length; i++) {
+        Constructor constructor = superclass.constructors[i];
         if (constructor.name == name) {
           return constructor;
         }
diff --git a/pkg/front_end/lib/src/source/source_constructor_builder.dart b/pkg/front_end/lib/src/source/source_constructor_builder.dart
@@ -427,7 +427,8 @@ class SourceConstructorBuilder extends SourceMemberBuilderImpl
   @override
   int buildBodyNodes(BuildNodesCallback f) {
     _introductory.buildBody();
-    for (ConstructorDeclaration augmentation in _augmentations) {
+    for (int i = 0; i < _augmentations.length; i++) {
+      ConstructorDeclaration augmentation = _augmentations[i];
       augmentation.buildBody();
     }
     return _augmentations.length;
@@ -447,7 +448,8 @@ class SourceConstructorBuilder extends SourceMemberBuilderImpl
           constructorBuilder: this,
           classHierarchy: classHierarchy,
           delayedDefaultValueCloners: delayedDefaultValueCloners);
-      for (ConstructorDeclaration augmentation in _augmentations) {
+      for (int i = 0; i < _augmentations.length; i++) {
+        ConstructorDeclaration augmentation = _augmentations[i];
         augmentation.buildOutlineExpressions(
             annotatables: annotatables,
             annotatablesFileUri: invokeTarget.fileUri,
@@ -473,7 +475,8 @@ class SourceConstructorBuilder extends SourceMemberBuilderImpl
         nameScheme: _nameScheme,
         constructorReferences: _constructorReferences,
         delayedDefaultValueCloners: _delayedDefaultValueCloners);
-    for (ConstructorDeclaration declaration in _augmentedDeclarations) {
+    for (int i = 0; i < _augmentedDeclarations.length; i++) {
+      ConstructorDeclaration declaration = _augmentedDeclarations[i];
       declaration.buildOutlineNodes(noAddBuildNodesCallback,
           constructorBuilder: this,
           libraryBuilder: libraryBuilder,
@@ -487,7 +490,8 @@ class SourceConstructorBuilder extends SourceMemberBuilderImpl
   void checkTypes(SourceLibraryBuilder libraryBuilder, NameSpace nameSpace,
       TypeEnvironment typeEnvironment) {
     _introductory.checkTypes(libraryBuilder, nameSpace, typeEnvironment);
-    for (ConstructorDeclaration augmentation in _augmentations) {
+    for (int i = 0; i < _augmentations.length; i++) {
+      ConstructorDeclaration augmentation = _augmentations[i];
       augmentation.checkTypes(libraryBuilder, nameSpace, typeEnvironment);
     }
   }
@@ -502,7 +506,8 @@ class SourceConstructorBuilder extends SourceMemberBuilderImpl
       {required bool inErrorRecovery}) {
     int count = _introductory.computeDefaultTypes(context,
         inErrorRecovery: inErrorRecovery);
-    for (ConstructorDeclaration augmentation in _augmentations) {
+    for (int i = 0; i < _augmentations.length; i++) {
+      ConstructorDeclaration augmentation = _augmentations[i];
       count += augmentation.computeDefaultTypes(context,
           inErrorRecovery: inErrorRecovery);
     }
@@ -514,7 +519,8 @@ class SourceConstructorBuilder extends SourceMemberBuilderImpl
     if (_hasFormalsInferred) return;
     _introductory.inferFormalTypes(libraryBuilder, declarationBuilder, this,
         hierarchy, _delayedDefaultValueCloners);
-    for (ConstructorDeclaration augmentation in _augmentations) {
+    for (int i = 0; i < _augmentations.length; i++) {
+      ConstructorDeclaration augmentation = _augmentations[i];
       augmentation.inferFormalTypes(libraryBuilder, declarationBuilder, this,
           hierarchy, _delayedDefaultValueCloners);
     }
@@ -528,7 +534,8 @@ class SourceConstructorBuilder extends SourceMemberBuilderImpl
 
   void prepareInitializers() {
     _introductory.prepareInitializers();
-    for (ConstructorDeclaration augmentation in _augmentations) {
+    for (int i = 0; i < _augmentations.length; i++) {
+      ConstructorDeclaration augmentation = _augmentations[i];
       augmentation.prepareInitializers();
     }
     redirectingInitializer = null;
diff --git a/pkg/front_end/lib/src/source/source_function_builder.dart b/pkg/front_end/lib/src/source/source_function_builder.dart
@@ -41,7 +41,8 @@ void buildTypeParametersAndFormals(
             initialVariance: Variance.contravariant);
   }
   if (declaredTypeParameters != null) {
-    for (SourceNominalParameterBuilder t in declaredTypeParameters) {
+    for (int i = 0; i < declaredTypeParameters.length; i++) {
+      SourceNominalParameterBuilder t = declaredTypeParameters[i];
       TypeParameter parameter = t.parameter;
       if (supportsTypeParameters) {
         function.typeParameters.add(parameter);
@@ -55,7 +56,8 @@ void buildTypeParametersAndFormals(
     setParents(function.typeParameters, function);
   }
   if (declaredFormals != null) {
-    for (FormalParameterBuilder formal in declaredFormals) {
+    for (int i = 0; i < declaredFormals.length; i++) {
+      FormalParameterBuilder formal = declaredFormals[i];
       VariableDeclaration parameter = formal.build(libraryBuilder);
       if (needsCheckVisitor != null) {
         if (parameter.type.accept(needsCheckVisitor)) {
diff --git a/pkg/front_end/lib/src/source/source_library_builder.dart b/pkg/front_end/lib/src/source/source_library_builder.dart
@@ -1215,12 +1215,13 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
   }
 
   void _reportTypeArgumentIssues(
-      Iterable<TypeArgumentIssue> issues, Uri fileUri, int offset,
+      List<TypeArgumentIssue> issues, Uri fileUri, int offset,
       {bool? inferred,
       TypeArgumentsInfo? typeArgumentsInfo,
       DartType? targetReceiver,
       String? targetName}) {
-    for (TypeArgumentIssue issue in issues) {
+    for (int i = 0; i < issues.length; i++) {
+      TypeArgumentIssue issue = issues[i];
       DartType argument = issue.argument;
       TypeParameter? typeParameter = issue.typeParameter;
 
@@ -1388,7 +1389,8 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
       List<FormalParameterBuilder>? formals, TypeEnvironment typeEnvironment,
       {required bool isAbstract, required bool isExternal}) {
     if (formals != null && !(isAbstract || isExternal)) {
-      for (FormalParameterBuilder formal in formals) {
+      for (int i = 0; i < formals.length; i++) {
+        FormalParameterBuilder formal = formals[i];
         bool isOptionalPositional =
             formal.isOptionalPositional && formal.isPositional;
         bool isOptionalNamed = !formal.isRequiredNamed && formal.isNamed;
diff --git a/pkg/front_end/lib/src/source/source_method_builder.dart b/pkg/front_end/lib/src/source/source_method_builder.dart
diff --git a/pkg/front_end/lib/src/source/type_parameter_factory.dart b/pkg/front_end/lib/src/source/type_parameter_factory.dart
diff --git a/pkg/front_end/lib/src/type_inference/inference_visitor.dart b/pkg/front_end/lib/src/type_inference/inference_visitor.dart
diff --git a/pkg/front_end/lib/src/type_inference/inference_visitor_base.dart b/pkg/front_end/lib/src/type_inference/inference_visitor_base.dart
diff --git a/pkg/front_end/test/coverage_suite_expected.dart b/pkg/front_end/test/coverage_suite_expected.dart
diff --git a/pkg/kernel/lib/clone.dart b/pkg/kernel/lib/clone.dart
diff --git a/pkg/kernel/lib/src/bounds_checks.dart b/pkg/kernel/lib/src/bounds_checks.dart

Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,8 @@ mixin _DirectMethodEncodingMixin implements MethodEncoding {`
`254`	`254`	`return new FormalParameterScope(parent: parent);`
`255`	`255`	`}`
`256`	`256`	`Map<String, VariableBuilder> local = {};`
`257`		`- for (FormalParameterBuilder formal in formals) {`
	`257`	`+ for (int i = 0; i < formals.length; i++) {`
	`258`	`+ FormalParameterBuilder formal = formals[i];`
`258`	`259`	`if (formal.isWildcard) {`
`259`	`260`	`continue;`
`260`	`261`	`}`
`@@ -270,7 +271,8 @@ mixin _DirectMethodEncodingMixin implements MethodEncoding {`
`270`	`271`	`.build(libraryBuilder, TypeUse.returnType, hierarchy: hierarchy);`
`271`	`272`	`List<FormalParameterBuilder>? declaredFormals = _fragment.declaredFormals;`
`272`	`273`	`if (declaredFormals != null) {`
`273`		`- for (FormalParameterBuilder formal in declaredFormals) {`
	`274`	`+ for (int i = 0; i < declaredFormals.length; i++) {`
	`275`	`+ FormalParameterBuilder formal = declaredFormals[i];`
`274`	`276`	`formal.type`
`275`	`277`	`.build(libraryBuilder, TypeUse.parameterType, hierarchy: hierarchy);`
`276`	`278`	`}`