Infer types of field formals before all fields.

scheglov · commit-bot@chromium.org · commit cbf9cff19fa6 · 2019-07-01T15:53:15.000Z
It will not happen strictly before, it happens together, because we set _FunctionElementForLink_Initializer for fields, which will perform field type inference when requested. Found this while running over google3. R=brianwilkerson@google.com, paulberry@google.com Change-Id: I360dff7e815ba997680c4a719a3e82827368db42 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/107780 Reviewed-by: Paul Berry <paulberry@google.com> Reviewed-by: Brian Wilkerson <brianwilkerson@google.com> Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analyzer/lib/src/summary2/top_level_inference.dart b/pkg/analyzer/lib/src/summary2/top_level_inference.dart
@@ -93,8 +93,8 @@ class TopLevelInference {
     initializerInference.createNodes();
 
     _performOverrideInference();
-    initializerInference.perform();
     _inferConstructorFieldFormals();
+    initializerInference.perform();
   }
 
   void _inferConstructorFieldFormals() {
@@ -103,6 +103,7 @@ class TopLevelInference {
         for (var class_ in unit.types) {
           var fields = <String, DartType>{};
           for (var field in class_.fields) {
+            if (field.isStatic) continue;
             if (field.isSynthetic) continue;
 
             var name = field.name;
diff --git a/pkg/analyzer/test/src/summary/resynthesize_common.dart b/pkg/analyzer/test/src/summary/resynthesize_common.dart
@@ -9580,6 +9580,21 @@ int y;
 ''');
   }
 
+  test_type_inference_fieldFormal_depends_onField() async {
+    var library = await checkLibrary('''
+class A<T> {
+  var f = 0;
+  A(this.f);
+}
+''');
+    checkElementText(library, r'''
+class A<T> {
+  int f;
+  A(int this.f);
+}
+''');
+  }
+
   test_type_inference_multiplyDefinedElement() async {
     addLibrarySource('/a.dart', 'class C {}');
     addLibrarySource('/b.dart', 'class C {}');
@@ -9622,6 +9637,34 @@ dynamic Function([dynamic]) x;
 ''');
   }
 
+  test_type_inference_topVariable_depends_onFieldFormal() async {
+    var library = await checkLibrary('''
+class A {}
+
+class B extends A {}
+
+class C<T extends A> {
+  final T f;
+  const C(this.f);
+}
+
+final b = B();
+final c = C(b);
+''');
+    checkElementText(library, r'''
+class A {
+}
+class B extends A {
+}
+class C<T extends A> {
+  final T f;
+  const C(T this.f);
+}
+final B b;
+final C<B> c;
+''');
+  }
+
   test_type_invalid_topLevelVariableElement_asType() async {
     var library = await checkLibrary('''
 class C<T extends V> {}
