Make nested_generic_closure_test work for dart2js

Change-Id: I07fa89b184cd542ebd028dbf70279ee6d64cd1cf
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/107834
Commit-Queue: Stephen Adams <[email protected]>
Reviewed-by: Lasse R.H. Nielsen <[email protected]>

Author: rakudrama

tests/language_2/language_2_dart2js.status

@@ -164,7 +164,6 @@ mock_writable_final_private_field_test: RuntimeError # Issue 17526, 30847
 modulo_test: RuntimeError # non JS number semantics
 named_parameters_default_eq_test/none: RuntimeError
 nan_identical_test: RuntimeError # Issue 11551
-nested_generic_closure_test: RuntimeError
 no_main_test/01: CompileTimeError
 no_such_method_mock_test: RuntimeError
 null_no_such_method_test: CompileTimeError
@@ -459,7 +458,6 @@ mock_writable_final_field_test: RuntimeError # Issue 30847
 mock_writable_final_private_field_test: RuntimeError # Issue 17526, 30847
 modulo_test: RuntimeError # non JS number semantics
 nan_identical_test: RuntimeError # Issue 11551
-nested_generic_closure_test: Crash # Unsupported operation: Unsupported type parameter type node F.
 no_main_test/01: CompileTimeError
 not_enough_positional_arguments_test/00: MissingCompileTimeError
 not_enough_positional_arguments_test/01: MissingCompileTimeError

tests/language_2/nested_generic_closure_test.dart

@@ -2,7 +2,7 @@
 // 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.
 
-// VMOptions=--reify-generic-functions
+// TODO(37452): Avoid using unspecified 'toString' behaviour in language test.
 
 import 'package:expect/expect.dart';
 
@@ -25,11 +25,34 @@ class C<T> {
 }
 
 main() {
-  Expect.equals("(<F>(F) => F) => void", foo.runtimeType.toString());
-  Expect.equals("<B>(<F>(F) => B) => B", bar.runtimeType.toString());
-  Expect.equals("<F>(F) => int", baz<int>().runtimeType.toString());
+  expectOne(
+    foo.runtimeType.toString(),
+    ["(<F>(F) => F) => void", "(<T1>(T1) => T1) => void"],
+  );
+  expectOne(
+    bar.runtimeType.toString(),
+    ["<B>(<F>(F) => B) => B", "<T1>(<T2>(T2) => T1) => T1"],
+  );
+  expectOne(
+    baz<int>().runtimeType.toString(),
+    ["<F>(F) => int", "<T1>(T1) => int"],
+  );
+
   var c = new C<bool>();
-  Expect.equals("(<F>(bool, F) => F) => void", c.foo.runtimeType.toString());
-  Expect.equals("<B>(<F>(bool, F) => B) => B", c.bar.runtimeType.toString());
-  Expect.equals("<F>(bool, F) => int", c.baz<int>().runtimeType.toString());
+  expectOne(
+    c.foo.runtimeType.toString(),
+    ["(<F>(bool, F) => F) => void", "(<T1>(bool, T1) => T1) => void"],
+  );
+  expectOne(
+    c.bar.runtimeType.toString(),
+    ["<B>(<F>(bool, F) => B) => B", "<T1>(<T2>(bool, T2) => T1) => T1"],
+  );
+  expectOne(
+    c.baz<int>().runtimeType.toString(),
+    ["<F>(bool, F) => int", "<T1>(bool, T1) => int"],
+  );
+}
+
+expectOne(String name, Iterable<String> names) {
+  Expect.isTrue(names.contains(name), '"$name" should be one of: ${names}');
 }