[cfe] Add DillConstructorBuilder to super parameters inference

Part of #47525

Change-Id: If88bf24dffa79e214e49b5133ee8314bbdb53716
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/239426
Reviewed-by: Johnni Winther <[email protected]>
Commit-Queue: Chloe Stefantsova <[email protected]>

Author: chloestefantsova

pkg/front_end/lib/src/fasta/source/source_constructor_builder.dart

@@ -320,8 +320,20 @@ class DeclaredSourceConstructorBuilder extends SourceFunctionBuilderImpl
 
     ConstructorBuilder? superTargetBuilder =
         _computeSuperTargetBuilder(initializers);
+
+    if (superTargetBuilder is DeclaredSourceConstructorBuilder) {
+      superTargetBuilder.inferFormalTypes(typeEnvironment);
+    } else if (superTargetBuilder is SyntheticSourceConstructorBuilder) {
+      MemberBuilder? superTargetOriginBuilder =
+          superTargetBuilder._effectivelyDefiningConstructor;
+      if (superTargetOriginBuilder is DeclaredSourceConstructorBuilder) {
+        superTargetOriginBuilder.inferFormalTypes(typeEnvironment);
+      }
+    }
+
     Constructor superTarget;
     List<FormalParameterBuilder>? superFormals;
+    FunctionNode? superConstructorFunction;
     if (superTargetBuilder is DeclaredSourceConstructorBuilder) {
       superTarget = superTargetBuilder.constructor;
       superFormals = superTargetBuilder.formals!;
@@ -330,30 +342,45 @@ class DeclaredSourceConstructorBuilder extends SourceFunctionBuilderImpl
       if (superTargetBuilder is SyntheticSourceConstructorBuilder) {
         superFormals = superTargetBuilder.formals;
       } else {
-        // The error in this case should be reported elsewhere. Here we perform
-        // a simple recovery.
-        return performRecoveryForErroneousCase();
+        superConstructorFunction = superTargetBuilder.function;
       }
     } else {
       // The error in this case should be reported elsewhere. Here we perform a
       // simple recovery.
       return performRecoveryForErroneousCase();
     }
 
-    if (superFormals == null) {
-      // The error in this case should be reported elsewhere. Here we perform a
-      // simple recovery.
-      return performRecoveryForErroneousCase();
-    }
-
-    if (superTargetBuilder is DeclaredSourceConstructorBuilder) {
-      superTargetBuilder.inferFormalTypes(typeEnvironment);
-    } else if (superTargetBuilder is SyntheticSourceConstructorBuilder) {
-      MemberBuilder? superTargetOriginBuilder =
-          superTargetBuilder._effectivelyDefiningConstructor;
-      if (superTargetOriginBuilder is DeclaredSourceConstructorBuilder) {
-        superTargetOriginBuilder.inferFormalTypes(typeEnvironment);
+    List<DartType?> positionalSuperFormalType = [];
+    List<bool> positionalSuperFormalHasInitializer = [];
+    Map<String, DartType?> namedSuperFormalType = {};
+    Map<String, bool> namedSuperFormalHasInitializer = {};
+    if (superFormals != null) {
+      for (FormalParameterBuilder formal in superFormals) {
+        if (formal.isPositional) {
+          positionalSuperFormalType.add(formal.variable?.type);
+          positionalSuperFormalHasInitializer
+              .add(formal.hasDeclaredInitializer);
+        } else {
+          namedSuperFormalType[formal.name] = formal.variable?.type;
+          namedSuperFormalHasInitializer[formal.name] =
+              formal.hasDeclaredInitializer;
+        }
+      }
+    } else if (superConstructorFunction != null) {
+      for (VariableDeclaration formal
+          in superConstructorFunction.positionalParameters) {
+        positionalSuperFormalType.add(formal.type);
+        positionalSuperFormalHasInitializer.add(formal.initializer != null);
       }
+      for (VariableDeclaration formal
+          in superConstructorFunction.namedParameters) {
+        namedSuperFormalType[formal.name!] = formal.type;
+        namedSuperFormalHasInitializer[formal.name!] =
+            formal.initializer != null;
+      }
+    } else {
+      // The error is reported elsewhere.
+      return performRecoveryForErroneousCase();
     }
 
     int superInitializingFormalIndex = -1;
@@ -373,33 +400,30 @@ class DeclaredSourceConstructorBuilder extends SourceFunctionBuilderImpl
         superInitializingFormalIndex++;
         bool hasImmediatelyDeclaredInitializer = formal.hasDeclaredInitializer;
 
-        FormalParameterBuilder? correspondingSuperFormal;
-
+        DartType? correspondingSuperFormalType;
         if (formal.isPositional) {
-          if (superInitializingFormalIndex < superFormals.length) {
-            correspondingSuperFormal =
-                superFormals[superInitializingFormalIndex];
+          assert(positionalSuperFormalHasInitializer.length ==
+              positionalSuperFormalType.length);
+          if (superInitializingFormalIndex <
+              positionalSuperFormalHasInitializer.length) {
             formal.hasDeclaredInitializer = hasImmediatelyDeclaredInitializer ||
-                correspondingSuperFormal.hasDeclaredInitializer;
+                positionalSuperFormalHasInitializer[
+                    superInitializingFormalIndex];
+            correspondingSuperFormalType =
+                positionalSuperFormalType[superInitializingFormalIndex];
             if (!hasImmediatelyDeclaredInitializer && !formal.isRequired) {
               (positionalSuperParameters ??= <int?>[]).add(formalIndex);
             } else {
               (positionalSuperParameters ??= <int?>[]).add(null);
             }
           } else {
-            // TODO(cstefantsova): Report an error.
+            // The error is reported elsewhere.
           }
         } else {
-          for (FormalParameterBuilder superFormal in superFormals) {
-            if (superFormal.isNamed && superFormal.name == formal.name) {
-              correspondingSuperFormal = superFormal;
-              break;
-            }
-          }
-
-          if (correspondingSuperFormal != null) {
+          if (namedSuperFormalHasInitializer[formal.name] != null) {
             formal.hasDeclaredInitializer = hasImmediatelyDeclaredInitializer ||
-                correspondingSuperFormal.hasDeclaredInitializer;
+                namedSuperFormalHasInitializer[formal.name]!;
+            correspondingSuperFormalType = namedSuperFormalType[formal.name];
             if (!hasImmediatelyDeclaredInitializer && !formal.isNamedRequired) {
               (namedSuperParameters ??= <String>[]).add(formal.name);
             }
@@ -409,7 +433,7 @@ class DeclaredSourceConstructorBuilder extends SourceFunctionBuilderImpl
         }
 
         if (formal.type == null) {
-          DartType? type = correspondingSuperFormal?.variable?.type;
+          DartType? type = correspondingSuperFormalType;
           if (substitution.isNotEmpty && type != null) {
             type = substitute(type, substitution);
           }

pkg/front_end/testcases/incremental/super_key.yaml

@@ -0,0 +1,49 @@
+# Copyright (c) 2020, the Dart project authors. Please see the AUTHORS file
+# for details. All rights reserved. Use of this source code is governed by a
+# BSD-style license that can be found in the LICENSE.md file.
+
+type: newworld
+target: DDC
+trackWidgetCreation: true
+worlds:
+  - entry: main.dart
+    sources:
+      main.dart: |
+        import 'package:flutter/src/widgets/framework.dart';
+      flutter/lib/src/widgets/framework.dart: |
+        abstract class Bar {
+          const Bar();
+        }
+        abstract class Widget extends Bar {
+          const Widget();
+        }
+        class Key {}
+        class StatefulWidget extends Widget {
+          final Key? key;
+        
+          const StatefulWidget({this.key});
+        }
+      .dart_tool/package_config.json: |
+        {
+          "configVersion": 2,
+          "packages": [
+            {
+              "name": "flutter",
+              "rootUri": "../flutter",
+              "packageUri": "lib/"
+            }
+          ]
+        }
+    expectedLibraryCount: 2
+  - entry: main.dart
+    worldType: updated
+    invalidate:
+      - main.dart
+    expectInitializeFromDill: false
+    sources:
+      main.dart: |
+        import 'package:flutter/src/widgets/framework.dart';
+        class GalleryApp extends StatefulWidget {
+          const GalleryApp({super.key});
+        }
+    expectedLibraryCount: 2

pkg/front_end/testcases/incremental/super_key.yaml.world.1.expect

@@ -0,0 +1,37 @@
+main = <No Member>;
+library from "package:flutter/src/widgets/framework.dart" as fra {
+
+  abstract class Bar extends dart.core::Object /*hasConstConstructor*/  {
+    const constructor •() → fra::Bar
+      : super dart.core::Object::•()
+      ;
+  }
+  abstract class Widget extends fra::Bar /*hasConstConstructor*/  {
+    const constructor •() → fra::Widget
+      : super fra::Bar::•()
+      ;
+  }
+  class Key extends dart.core::Object {
+    synthetic constructor •() → fra::Key
+      : super dart.core::Object::•()
+      ;
+    static method _#new#tearOff() → fra::Key
+      return new fra::Key::•();
+  }
+  class StatefulWidget extends fra::Widget /*hasConstConstructor*/  {
+    final field fra::Key? key;
+    const constructor •({fra::Key? key = #C1}) → fra::StatefulWidget
+      : fra::StatefulWidget::key = key, super fra::Widget::•()
+      ;
+    static method _#new#tearOff({fra::Key? key = #C1}) → fra::StatefulWidget
+      return new fra::StatefulWidget::•(key: key);
+  }
+}
+library from "org-dartlang-test:///main.dart" as main {
+
+  import "package:flutter/src/widgets/framework.dart";
+
+}
+constants  {
+  #C1 = null
+}

pkg/front_end/testcases/incremental/super_key.yaml.world.2.expect

@@ -0,0 +1,44 @@
+main = <No Member>;
+library from "package:flutter/src/widgets/framework.dart" as fra {
+
+  abstract class Bar extends dart.core::Object /*hasConstConstructor*/  {
+    const constructor •() → fra::Bar
+      : super dart.core::Object::•()
+      ;
+  }
+  abstract class Widget extends fra::Bar /*hasConstConstructor*/  {
+    const constructor •() → fra::Widget
+      : super fra::Bar::•()
+      ;
+  }
+  class Key extends dart.core::Object {
+    synthetic constructor •() → fra::Key
+      : super dart.core::Object::•()
+      ;
+    static method _#new#tearOff() → fra::Key
+      return new fra::Key::•();
+  }
+  class StatefulWidget extends fra::Widget /*hasConstConstructor*/  {
+    final field fra::Key? key;
+    const constructor •({fra::Key? key = #C1}) → fra::StatefulWidget
+      : fra::StatefulWidget::key = key, super fra::Widget::•()
+      ;
+    static method _#new#tearOff({fra::Key? key = #C1}) → fra::StatefulWidget
+      return new fra::StatefulWidget::•(key: key);
+  }
+}
+library from "org-dartlang-test:///main.dart" as main {
+
+  import "package:flutter/src/widgets/framework.dart";
+
+  class GalleryApp extends fra::StatefulWidget /*hasConstConstructor*/  {
+    const constructor •({fra::Key? key = #C1}) → main::GalleryApp
+      : super fra::StatefulWidget::•(key: key)
+      ;
+    static method _#new#tearOff({fra::Key? key}) → main::GalleryApp
+      return new main::GalleryApp::•(key: key);
+  }
+}
+constants  {
+  #C1 = null
+}

pkg/front_end/testcases/super_parameters/super_key/main.dart

@@ -0,0 +1,7 @@
+import 'main_lib.dart';
+
+class GalleryApp extends StatefulWidget {
+  const GalleryApp({super.key});
+}
+
+main() {}

pkg/front_end/testcases/super_parameters/super_key/main.dart.strong.expect

@@ -0,0 +1,32 @@
+library /*isNonNullableByDefault*/;
+import self as self;
+import "main_lib.dart" as mai;
+
+import "org-dartlang-testcase:///main_lib.dart";
+
+class GalleryApp extends mai::StatefulWidget /*hasConstConstructor*/  {
+  const constructor •({mai::Key? key = #C1}) → self::GalleryApp
+    : super mai::StatefulWidget::•(key: key)
+    ;
+}
+static method main() → dynamic {}
+
+library /*isNonNullableByDefault*/;
+import self as mai;
+import "dart:core" as core;
+
+class Key extends core::Object {
+  synthetic constructor •() → mai::Key
+    : super core::Object::•()
+    ;
+}
+class StatefulWidget extends core::Object /*hasConstConstructor*/  {
+  final field mai::Key? key;
+  const constructor •({mai::Key? key = #C1}) → mai::StatefulWidget
+    : mai::StatefulWidget::key = key, super core::Object::•()
+    ;
+}
+
+constants  {
+  #C1 = null
+}

pkg/front_end/testcases/super_parameters/super_key/main.dart.strong.transformed.expect

@@ -0,0 +1,32 @@
+library /*isNonNullableByDefault*/;
+import self as self;
+import "main_lib.dart" as mai;
+
+import "org-dartlang-testcase:///main_lib.dart";
+
+class GalleryApp extends mai::StatefulWidget /*hasConstConstructor*/  {
+  const constructor •({mai::Key? key = #C1}) → self::GalleryApp
+    : super mai::StatefulWidget::•(key: key)
+    ;
+}
+static method main() → dynamic {}
+
+library /*isNonNullableByDefault*/;
+import self as mai;
+import "dart:core" as core;
+
+class Key extends core::Object {
+  synthetic constructor •() → mai::Key
+    : super core::Object::•()
+    ;
+}
+class StatefulWidget extends core::Object /*hasConstConstructor*/  {
+  final field mai::Key? key;
+  const constructor •({mai::Key? key = #C1}) → mai::StatefulWidget
+    : mai::StatefulWidget::key = key, super core::Object::•()
+    ;
+}
+
+constants  {
+  #C1 = null
+}

pkg/front_end/testcases/super_parameters/super_key/main.dart.textual_outline.expect

@@ -0,0 +1,7 @@
+import 'main_lib.dart';
+
+class GalleryApp extends StatefulWidget {
+  const GalleryApp({super.key});
+}
+
+main() {}

pkg/front_end/testcases/super_parameters/super_key/main.dart.textual_outline_modelled.expect

@@ -0,0 +1,7 @@
+import 'main_lib.dart';
+
+class GalleryApp extends StatefulWidget {
+  const GalleryApp({super.key});
+}
+
+main() {}

pkg/front_end/testcases/super_parameters/super_key/main.dart.weak.expect

@@ -0,0 +1,32 @@
+library /*isNonNullableByDefault*/;
+import self as self;
+import "main_lib.dart" as mai;
+
+import "org-dartlang-testcase:///main_lib.dart";
+
+class GalleryApp extends mai::StatefulWidget /*hasConstConstructor*/  {
+  const constructor •({mai::Key? key = #C1}) → self::GalleryApp
+    : super mai::StatefulWidget::•(key: key)
+    ;
+}
+static method main() → dynamic {}
+
+library /*isNonNullableByDefault*/;
+import self as mai;
+import "dart:core" as core;
+
+class Key extends core::Object {
+  synthetic constructor •() → mai::Key
+    : super core::Object::•()
+    ;
+}
+class StatefulWidget extends core::Object /*hasConstConstructor*/  {
+  final field mai::Key? key;
+  const constructor •({mai::Key? key = #C1}) → mai::StatefulWidget
+    : mai::StatefulWidget::key = key, super core::Object::•()
+    ;
+}
+
+constants  {
+  #C1 = null
+}