[CFE] Fix "Type 'void' not found." bug

Fixes #38943

Bug: 38943
Change-Id: I6086f5f46a67b37a04b21d0053fc7903a83df523
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/122000
Reviewed-by: Johnni Winther <johnniwinther@google.com>
Commit-Queue: Jens Johansen <jensj@google.com>

Author: jensjoha

pkg/front_end/lib/src/fasta/builder/named_type_builder.dart

@@ -31,6 +31,7 @@ import '../scope.dart';
 import '../severity.dart' show Severity;
 
 import 'builder.dart';
+import 'builtin_type_builder.dart';
 import 'class_builder.dart';
 import 'invalid_type_declaration_builder.dart';
 import 'library_builder.dart';
@@ -284,7 +285,11 @@ class NamedTypeBuilder extends TypeBuilder {
     }
     NamedTypeBuilder newType =
         new NamedTypeBuilder(name, nullabilityBuilder, clonedArguments);
-    newTypes.add(newType);
+    if (declaration is BuiltinTypeBuilder) {
+      newType.declaration = declaration;
+    } else {
+      newTypes.add(newType);
+    }
     return newType;
   }
 

pkg/front_end/testcases/general/issue38938.dart

@@ -1,3 +1,7 @@
+// Copyright (c) 2019, 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 file.
+
 class A {
   int v;
   int v;

pkg/front_end/testcases/general/issue38938.dart.outline.expect

@@ -2,10 +2,10 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/issue38938.dart:3:7: Error: 'v' is already declared in this scope.
+// pkg/front_end/testcases/general/issue38938.dart:7:7: Error: 'v' is already declared in this scope.
 //   int v;
 //       ^
-// pkg/front_end/testcases/general/issue38938.dart:2:7: Context: Previous declaration of 'v'.
+// pkg/front_end/testcases/general/issue38938.dart:6:7: Context: Previous declaration of 'v'.
 //   int v;
 //       ^
 //

pkg/front_end/testcases/general/issue38938.dart.strong.expect

@@ -2,14 +2,14 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/issue38938.dart:3:7: Error: 'v' is already declared in this scope.
+// pkg/front_end/testcases/general/issue38938.dart:7:7: Error: 'v' is already declared in this scope.
 //   int v;
 //       ^
-// pkg/front_end/testcases/general/issue38938.dart:2:7: Context: Previous declaration of 'v'.
+// pkg/front_end/testcases/general/issue38938.dart:6:7: Context: Previous declaration of 'v'.
 //   int v;
 //       ^
 //
-// pkg/front_end/testcases/general/issue38938.dart:4:10: Error: Can't use 'v' because it is declared more than once.
+// pkg/front_end/testcases/general/issue38938.dart:8:10: Error: Can't use 'v' because it is declared more than once.
 //   A(this.v);
 //          ^
 //
@@ -19,7 +19,7 @@ import "dart:core" as core;
 class A extends core::Object {
   field core::int* v = null;
   constructor •(core::int* v) → self::A*
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/issue38938.dart:4:10: Error: Can't use 'v' because it is declared more than once.
+    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/issue38938.dart:8:10: Error: Can't use 'v' because it is declared more than once.
   A(this.v);
          ^", super core::Object::•()
     ;

pkg/front_end/testcases/general/issue38938.dart.strong.transformed.expect

@@ -2,14 +2,14 @@ library;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/issue38938.dart:3:7: Error: 'v' is already declared in this scope.
+// pkg/front_end/testcases/general/issue38938.dart:7:7: Error: 'v' is already declared in this scope.
 //   int v;
 //       ^
-// pkg/front_end/testcases/general/issue38938.dart:2:7: Context: Previous declaration of 'v'.
+// pkg/front_end/testcases/general/issue38938.dart:6:7: Context: Previous declaration of 'v'.
 //   int v;
 //       ^
 //
-// pkg/front_end/testcases/general/issue38938.dart:4:10: Error: Can't use 'v' because it is declared more than once.
+// pkg/front_end/testcases/general/issue38938.dart:8:10: Error: Can't use 'v' because it is declared more than once.
 //   A(this.v);
 //          ^
 //
@@ -19,7 +19,7 @@ import "dart:core" as core;
 class A extends core::Object {
   field core::int* v = null;
   constructor •(core::int* v) → self::A*
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/issue38938.dart:4:10: Error: Can't use 'v' because it is declared more than once.
+    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general/issue38938.dart:8:10: Error: Can't use 'v' because it is declared more than once.
   A(this.v);
          ^", super core::Object::•()
     ;

pkg/front_end/testcases/general/issue38943.dart

@@ -0,0 +1,12 @@
+// Copyright (c) 2019, 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 file.
+
+class D<X extends void Function()> {
+  factory D.foo() => new D._();
+  D._() {}
+}
+
+main() {
+  print(new D.foo());
+}

pkg/front_end/testcases/general/issue38943.dart.outline.expect

@@ -0,0 +1,12 @@
+library;
+import self as self;
+import "dart:core" as core;
+
+class D<X extends () →* void = () →* void> extends core::Object {
+  constructor _() → self::D<self::D::X*>*
+    ;
+  static factory foo<X extends () →* void = dynamic>() → self::D<self::D::foo::X*>*
+    ;
+}
+static method main() → dynamic
+  ;

pkg/front_end/testcases/general/issue38943.dart.strong.expect

@@ -0,0 +1,13 @@
+library;
+import self as self;
+import "dart:core" as core;
+
+class D<X extends () →* void = () →* void> extends core::Object {
+  constructor _() → self::D<self::D::X*>*
+    : super core::Object::•() {}
+  static factory foo<X extends () →* void = dynamic>() → self::D<self::D::foo::X*>*
+    return new self::D::_<self::D::foo::X*>();
+}
+static method main() → dynamic {
+  core::print(self::D::foo<() →* void>());
+}

pkg/front_end/testcases/general/issue38943.dart.strong.transformed.expect

@@ -0,0 +1,13 @@
+library;
+import self as self;
+import "dart:core" as core;
+
+class D<X extends () →* void = () →* void> extends core::Object {
+  constructor _() → self::D<self::D::X*>*
+    : super core::Object::•() {}
+  static factory foo<X extends () →* void = dynamic>() → self::D<self::D::foo::X*>*
+    return new self::D::_<self::D::foo::X*>();
+}
+static method main() → dynamic {
+  core::print(self::D::foo<() →* void>());
+}

pkg/front_end/testcases/text_serialization.status

@@ -202,6 +202,7 @@ general/issue37381: TextSerializationFailure
 general/issue37776: TextSerializationFailure
 general/issue38812: TextSerializationFailure
 general/issue38938: TextSerializationFailure
+general/issue38943: TextSerializationFailure
 general/literals: TextSerializationFailure # Was: Pass
 general/local_generic_function: TextSerializationFailure # Was: Pass
 general/magic_const: TextSerializationFailure # Was: Pass