[cfe] Place return type into parameter scope in TypeBuilderComputer

Closes flutter/flutter#143689

Change-Id: Icf2a7631134fa31ef50c0feba5099870aaf2d3b6
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/355401
Reviewed-by: Jens Johansen <[email protected]>
Commit-Queue: Chloe Stefantsova <[email protected]>

pkg/front_end/lib/src/fasta/kernel/type_builder_computer.dart

@@ -165,8 +165,6 @@ class _TypeBuilderComputerHelper
   @override
   TypeBuilder visitFunctionType(FunctionType node,
       Map<TypeParameter, NominalVariableBuilder> pendingNominalVariables) {
-    TypeBuilder returnType =
-        node.returnType.accept1(this, pendingNominalVariables);
     List<StructuralVariableBuilder>? typeVariables = null;
     if (node.typeParameters.isNotEmpty) {
       typeVariables = <StructuralVariableBuilder>[
@@ -176,6 +174,9 @@ class _TypeBuilderComputerHelper
       ];
     }
 
+    TypeBuilder returnType =
+        node.returnType.accept1(this, pendingNominalVariables);
+
     List<DartType> positionalParameters = node.positionalParameters;
     List<NamedType> namedParameters = node.namedParameters;
     List<ParameterBuilder> formals = new List<ParameterBuilder>.filled(

pkg/front_end/testcases/general/with_dependencies/typedef_from_dill/typedef_from_dill.dart.strong.expect

@@ -0,0 +1,16 @@
+library;
+import self as self;
+import "dart:core" as core;
+
+import "org-dartlang-testcase:///typedef_from_dill_lib.dart";
+
+typedef Bar = <R extends core::Object? = dynamic>(() → R%) → R%;
+static method main() → void {
+  core::print("hello");
+}
+
+library;
+import self as self2;
+import "dart:core" as core;
+
+typedef Foo = <R extends core::Object? = dynamic>(() → R%) → R%;

pkg/front_end/testcases/general/with_dependencies/typedef_from_dill/typedef_from_dill.dart.strong.transformed.expect

@@ -0,0 +1,16 @@
+library;
+import self as self;
+import "dart:core" as core;
+
+import "org-dartlang-testcase:///typedef_from_dill_lib.dart";
+
+typedef Bar = <R extends core::Object? = dynamic>(() → R%) → R%;
+static method main() → void {
+  core::print("hello");
+}
+
+library;
+import self as self2;
+import "dart:core" as core;
+
+typedef Foo = <R extends core::Object? = dynamic>(() → R%) → R%;

pkg/front_end/testcases/general/with_dependencies/typedef_from_dill/typedef_from_dill.dart.weak.expect

@@ -0,0 +1,16 @@
+library;
+import self as self;
+import "dart:core" as core;
+
+import "org-dartlang-testcase:///typedef_from_dill_lib.dart";
+
+typedef Bar = <R extends core::Object? = dynamic>(() → R%) → R%;
+static method main() → void {
+  core::print("hello");
+}
+
+library;
+import self as self2;
+import "dart:core" as core;
+
+typedef Foo = <R extends core::Object? = dynamic>(() → R%) → R%;

pkg/front_end/testcases/general/with_dependencies/typedef_from_dill/typedef_from_dill.dart.weak.modular.expect

@@ -0,0 +1,10 @@
+library;
+import self as self;
+import "dart:core" as core;
+
+import "org-dartlang-testcase:///typedef_from_dill_lib.dart";
+
+typedef Bar = <R extends core::Object? = dynamic>(() → R%) → R%;
+static method main() → void {
+  core::print("hello");
+}

pkg/front_end/testcases/general/with_dependencies/typedef_from_dill/typedef_from_dill.dart.weak.outline.expect

@@ -0,0 +1,15 @@
+library;
+import self as self;
+import "dart:core" as core;
+
+import "org-dartlang-testcase:///typedef_from_dill_lib.dart";
+
+typedef Bar = <R extends core::Object? = dynamic>(() → R%) → R%;
+static method main() → void
+  ;
+
+library;
+import self as self2;
+import "dart:core" as core;
+
+typedef Foo = <R extends core::Object? = dynamic>(() → R%) → R%;

pkg/front_end/testcases/general/with_dependencies/typedef_from_dill/typedef_from_dill.dart.weak.transformed.expect

@@ -0,0 +1,16 @@
+library;
+import self as self;
+import "dart:core" as core;
+
+import "org-dartlang-testcase:///typedef_from_dill_lib.dart";
+
+typedef Bar = <R extends core::Object? = dynamic>(() → R%) → R%;
+static method main() → void {
+  core::print("hello");
+}
+
+library;
+import self as self2;
+import "dart:core" as core;
+
+typedef Foo = <R extends core::Object? = dynamic>(() → R%) → R%;

pkg/front_end/testcases/incremental.status

@@ -4,8 +4,6 @@
 
 # Status file for the test suite ../test/incremental_suite.dart.
 
-reproduce_DillTypeAliasBuilder_type_crash: Crash
-
 # http://dartbug.com/41812#issuecomment-684825703
 #strongmode_mixins_2: Crash
 

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

@@ -0,0 +1,17 @@
+main = main::main;
+library from "org-dartlang-test:///lib.dart" as lib {
+
+  typedef Foo = <R extends dart.core::Object? = dynamic>(() → R%) → R%;
+}
+library from "org-dartlang-test:///main.dart" as main {
+
+  import "org-dartlang-test:///lib.dart";
+
+  typedef Bar = <R extends dart.core::Object? = dynamic>(() → R%) → R%;
+  static method main() → dynamic {
+    dart.core::print("hello ${#C1}");
+  }
+}
+constants  {
+  #C1 = TypeLiteralConstant(<R extends dart.core::Object? = dynamic>(() →* R*) →* R*)
+}

pkg/front_end/testcases/modular.status

@@ -4,8 +4,6 @@
 
 # Status file for the modular_suite.dart test suite.
 
-general/with_dependencies/typedef_from_dill/typedef_from_dill: Crash
-
 constructor_tearoffs/call_instantiation: TypeCheckError
 enhanced_enums/declared_hashcode: TypeCheckError
 enhanced_enums/declared_index: TypeCheckError

pkg/front_end/testcases/outline.status

@@ -2,8 +2,6 @@
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
-general/with_dependencies/typedef_from_dill/typedef_from_dill: Crash
-
 const_functions/const_functions_const_factory: VerificationError
 enhanced_enums/declared_hashcode: TypeCheckError
 enhanced_enums/declared_index: TypeCheckError

pkg/front_end/testcases/strong.status

@@ -6,8 +6,6 @@
 # Kernel ASTs directly, that is, code in pkg/fasta/lib/src/kernel/ with
 # strong-mode enabled.
 
-general/with_dependencies/typedef_from_dill/typedef_from_dill: Crash
-
 # BAD ONES:
 class_modifiers/issue52115/main: SemiFuzzFailure # https://github.com/dart-lang/sdk/issues/53109
 class_modifiers/issue52316/main: SemiFuzzFailure # https://github.com/dart-lang/sdk/issues/53109

pkg/front_end/testcases/weak.status

@@ -4,8 +4,6 @@
 
 # Status file for the weak_suite.dart test suite.
 
-general/with_dependencies/typedef_from_dill/typedef_from_dill: Crash
-
 # BAD ONES:
 class_modifiers/issue52115/main: SemiFuzzFailure # https://github.com/dart-lang/sdk/issues/53109
 class_modifiers/issue52316/main: SemiFuzzFailure # https://github.com/dart-lang/sdk/issues/53109