Overloaded `Foo.NestedType()` does not create `ConstructorRefCallExpr`

[keith]

With this code:

// Module0
public struct Thing {
  public struct Nested {
    public init(string: String) {}
  }
}
// Module1
public struct Thing {}
// Module2
import Module0
import Module1

func foo() {
    _ = Thing.Nested(string: "lol")
}

The AST of Module2 does not contain a ConstructorRefCallExpr, and therefore does not correctly index the constructor being referenced. Here is the full AST:

(source_file "/Users/ksmiley/dev/oss-swift/build/Ninja-RelWithDebInfoAssert/swift-macosx-arm64/test-macosx-arm64/Index/Output/ambiguous-type.swift.tmp/file3.swift"
  (import_decl range=[/Users/ksmiley/dev/oss-swift/build/Ninja-RelWithDebInfoAssert/swift-macosx-arm64/test-macosx-arm64/Index/Output/ambiguous-type.swift.tmp/file3.swift:1:1 - line:1:8] 'file1')
  (import_decl range=[/Users/ksmiley/dev/oss-swift/build/Ninja-RelWithDebInfoAssert/swift-macosx-arm64/test-macosx-arm64/Index/Output/ambiguous-type.swift.tmp/file3.swift:2:1 - line:2:8] 'file2')
  (func_decl range=[/Users/ksmiley/dev/oss-swift/build/Ninja-RelWithDebInfoAssert/swift-macosx-arm64/test-macosx-arm64/Index/Output/ambiguous-type.swift.tmp/file3.swift:4:1 - line:6:1] "foo()" interface type='() -> ()' access=internal
    (parameter_list range=[/Users/ksmiley/dev/oss-swift/build/Ninja-RelWithDebInfoAssert/swift-macosx-arm64/test-macosx-arm64/Index/Output/ambiguous-type.swift.tmp/file3.swift:4:9 - line:4:10])
    (brace_stmt range=[/Users/ksmiley/dev/oss-swift/build/Ninja-RelWithDebInfoAssert/swift-macosx-arm64/test-macosx-arm64/Index/Output/ambiguous-type.swift.tmp/file3.swift:4:12 - line:6:1]
      (assign_expr type='()' location=/Users/ksmiley/dev/oss-swift/build/Ninja-RelWithDebInfoAssert/swift-macosx-arm64/test-macosx-arm64/Index/Output/ambiguous-type.swift.tmp/file3.swift:5:5 range=[/Users/ksmiley/dev/oss-swift/build/Ninja-RelWithDebInfoAssert/swift-macosx-arm64/test-macosx-arm64/Index/Output/ambiguous-type.swift.tmp/file3.swift:5:3 - line:5:33]
        (discard_assignment_expr type='@lvalue Thing.Nested' location=/Users/ksmiley/dev/oss-swift/build/Ninja-RelWithDebInfoAssert/swift-macosx-arm64/test-macosx-arm64/Index/Output/ambiguous-type.swift.tmp/file3.swift:5:3 range=[/Users/ksmiley/dev/oss-swift/build/Ninja-RelWithDebInfoAssert/swift-macosx-arm64/test-macosx-arm64/Index/Output/ambiguous-type.swift.tmp/file3.swift:5:3 - line:5:3])
        (call_expr type='Thing.Nested' location=/Users/ksmiley/dev/oss-swift/build/Ninja-RelWithDebInfoAssert/swift-macosx-arm64/test-macosx-arm64/Index/Output/ambiguous-type.swift.tmp/file3.swift:5:7 range=[/Users/ksmiley/dev/oss-swift/build/Ninja-RelWithDebInfoAssert/swift-macosx-arm64/test-macosx-arm64/Index/Output/ambiguous-type.swift.tmp/file3.swift:5:7 - line:5:33] nothrow
          (autoclosure_expr type='(String) -> Thing.Nested' location=/Users/ksmiley/dev/oss-swift/build/Ninja-RelWithDebInfoAssert/swift-macosx-arm64/test-macosx-arm64/Index/Output/ambiguous-type.swift.tmp/file3.swift:5:7 range=[/Users/ksmiley/dev/oss-swift/build/Ninja-RelWithDebInfoAssert/swift-macosx-arm64/test-macosx-arm64/Index/Output/ambiguous-type.swift.tmp/file3.swift:5:7 - line:5:13] discriminator=0 escaping

            (parameter_list
              (parameter "string" apiName=string type='String' interface type='String'))
            (call_expr implicit type='Thing.Nested' location=/Users/ksmiley/dev/oss-swift/build/Ninja-RelWithDebInfoAssert/swift-macosx-arm64/test-macosx-arm64/Index/Output/ambiguous-type.swift.tmp/file3.swift:5:7 range=[/Users/ksmiley/dev/oss-swift/build/Ninja-RelWithDebInfoAssert/swift-macosx-arm64/test-macosx-arm64/Index/Output/ambiguous-type.swift.tmp/file3.swift:5:7 - line:5:13] nothrow
              (dot_syntax_call_expr implicit type='(String) -> Thing.Nested' location=/Users/ksmiley/dev/oss-swift/build/Ninja-RelWithDebInfoAssert/swift-macosx-arm64/test-macosx-arm64/Index/Output/ambiguous-type.swift.tmp/file3.swift:5:7 range=[/Users/ksmiley/dev/oss-swift/build/Ninja-RelWithDebInfoAssert/swift-macosx-arm64/test-macosx-arm64/Index/Output/ambiguous-type.swift.tmp/file3.swift:5:7 - line:5:13] nothrow
                (declref_expr implicit type='(Thing.Nested.Type) -> (String) -> Thing.Nested' location=/Users/ksmiley/dev/oss-swift/build/Ninja-RelWithDebInfoAssert/swift-macosx-arm64/test-macosx-arm64/Index/Output/ambiguous-type.swift.tmp/file3.swift:5:13 range=[/Users/ksmiley/dev/oss-swift/build/Ninja-RelWithDebInfoAssert/swift-macosx-arm64/test-macosx-arm64/Index/Output/ambiguous-type.swift.tmp/file3.swift:5:13 - line:5:13] decl=file1.(file).Thing.Nested.init(string:) function_ref=single)
                (argument_list implicit
                  (argument
                    (dot_self_expr type='Thing.Nested.Type' location=/Users/ksmiley/dev/oss-swift/build/Ninja-RelWithDebInfoAssert/swift-macosx-arm64/test-macosx-arm64/Index/Output/ambiguous-type.swift.tmp/file3.swift:5:7 range=[/Users/ksmiley/dev/oss-swift/build/Ninja-RelWithDebInfoAssert/swift-macosx-arm64/test-macosx-arm64/Index/Output/ambiguous-type.swift.tmp/file3.swift:5:7 - line:5:13]
                      (dot_syntax_base_ignored type='Thing.Nested.Type' location=/Users/ksmiley/dev/oss-swift/build/Ninja-RelWithDebInfoAssert/swift-macosx-arm64/test-macosx-arm64/Index/Output/ambiguous-type.swift.tmp/file3.swift:5:7 range=[/Users/ksmiley/dev/oss-swift/build/Ninja-RelWithDebInfoAssert/swift-macosx-arm64/test-macosx-arm64/Index/Output/ambiguous-type.swift.tmp/file3.swift:5:7 - line:5:13]
                        (type_expr type='Thing.Type' location=/Users/ksmiley/dev/oss-swift/build/Ninja-RelWithDebInfoAssert/swift-macosx-arm64/test-macosx-arm64/Index/Output/ambiguous-type.swift.tmp/file3.swift:5:7 range=[/Users/ksmiley/dev/oss-swift/build/Ninja-RelWithDebInfoAssert/swift-macosx-arm64/test-macosx-arm64/Index/Output/ambiguous-type.swift.tmp/file3.swift:5:7 - line:5:7] typerepr='Thing')
                        (type_expr type='Thing.Nested.Type' location=/Users/ksmiley/dev/oss-swift/build/Ninja-RelWithDebInfoAssert/swift-macosx-arm64/test-macosx-arm64/Index/Output/ambiguous-type.swift.tmp/file3.swift:5:13 range=[/Users/ksmiley/dev/oss-swift/build/Ninja-RelWithDebInfoAssert/swift-macosx-arm64/test-macosx-arm64/Index/Output/ambiguous-type.swift.tmp/file3.swift:5:13 - line:5:13] typerepr='Nested'))))))
              (argument_list implicit labels=string:
                (argument label=string
                  (declref_expr implicit type='String' decl=file3.(file).foo().autoclosure discriminator=0.string function_ref=unapplied)))))
          (argument_list labels=string:
            (argument label=string
              (string_literal_expr type='String' location=/Users/ksmiley/dev/oss-swift/build/Ninja-RelWithDebInfoAssert/swift-macosx-arm64/test-macosx-arm64/Index/Output/ambiguous-type.swift.tmp/file3.swift:5:28 range=[/Users/ksmiley/dev/oss-swift/build/Ninja-RelWithDebInfoAssert/swift-macosx-arm64/test-macosx-arm64/Index/Output/ambiguous-type.swift.tmp/file3.swift:5:28 - line:5:28] encoding=utf8 value="lol" builtin_initializer=Swift.(file).String extension.init(_builtinStringLiteral:utf8CodeUnitCount:isASCII:) initializer=**NULL**))))))))

If you remove the import to Module1, it resolves the issue.

ed3555a

[keith]

The dot_syntax_call_expr which I believe should be the constructor, is created here https://github.com/apple/swift/blob/ed3555ad079552d496a78148daf6d40cd677bf8d/lib/Sema/CSApply.cpp#L1147-L1148

[keith]

Something like this seems to fix this case:

diff --git a/lib/Sema/CSApply.cpp b/lib/Sema/CSApply.cpp
index 04b102b2487..f4d996b430d 100644
--- a/lib/Sema/CSApply.cpp
+++ b/lib/Sema/CSApply.cpp
@@ -1038,7 +1038,8 @@ namespace {
     ApplyExpr *buildSingleCurryThunkBodyCall(Expr *baseExpr, Expr *fnExpr,
                                              DeclContext *declOrClosure,
                                              ParameterList *thunkParamList,
-                                             ConstraintLocatorBuilder locator) {
+                                             ConstraintLocatorBuilder locator,
+                                             bool isConstructor) {
       auto &ctx = cs.getASTContext();
       auto *const fnTy = cs.getType(fnExpr)->castTo<FunctionType>();
       auto *calleeFnTy = fnTy;
@@ -1145,8 +1146,11 @@ namespace {
                                           fnTy->getExtInfo()));
         cs.cacheType(fnExpr);

-        fnExpr = DotSyntaxCallExpr::create(ctx, fnExpr, SourceLoc(),
-                                           Argument::unlabeled(baseExpr));
+        if (isConstructor)
+          fnExpr = ConstructorRefCallExpr::create(ctx, fnExpr, baseExpr);
+        else
+          fnExpr = DotSyntaxCallExpr::create(ctx, fnExpr, SourceLoc(),
+                                            Argument::unlabeled(baseExpr));
       }
       fnExpr->setType(newCalleeFnTy);
       cs.cacheType(fnExpr);
@@ -1174,7 +1178,8 @@ namespace {
     AutoClosureExpr *buildSingleCurryThunk(Expr *baseExpr, Expr *fnExpr,
                                            DeclContext *declOrClosure,
                                            FunctionType *thunkTy,
-                                           ConstraintLocatorBuilder locator) {
+                                           ConstraintLocatorBuilder locator,
+                                           bool isConstructor = false) {
       auto &ctx = cs.getASTContext();

       const OptionSet<ParameterList::CloneFlags> options =
@@ -1218,7 +1223,7 @@ namespace {
       }

       Expr *thunkBody = buildSingleCurryThunkBodyCall(
-          baseExpr, fnExpr, declOrClosure, thunkParamList, locator);
+          baseExpr, fnExpr, declOrClosure, thunkParamList, locator, isConstructor);

       // If we called a function with a dynamic 'Self' result, we may need some
       // special handling.
@@ -1300,7 +1305,8 @@ namespace {
     /// the locator is used to pull them in.
     AutoClosureExpr *buildSingleCurryThunk(Expr *baseExpr, Expr *fnExpr,
                                            DeclContext *declOrClosure,
-                                           ConstraintLocatorBuilder locator) {
+                                           ConstraintLocatorBuilder locator,
+                                           bool isConstructor = false) {
       assert(baseExpr);
       auto *const thunkTy = cs.getType(fnExpr)
                                 ->castTo<FunctionType>()
@@ -1308,7 +1314,7 @@ namespace {
                                 ->castTo<FunctionType>();

       return buildSingleCurryThunk(baseExpr, fnExpr, declOrClosure, thunkTy,
-                                   locator);
+                                   locator, isConstructor);
     }

     /// Build a "{ self in { args in self.fn(args) } }" nested curry thunk.
@@ -1790,7 +1796,8 @@ namespace {
         // operation concerns with capturing vs. evaluating it in the closure),
         // or to evaluate the base as a capture and hand it down via the
         // capture list.
-        if (isa<ConstructorDecl>(member) || member->isStatic()) {
+        bool isConstructor = isa<ConstructorDecl>(member);
+        if (isConstructor || member->isStatic()) {
           if (cs.isStaticallyDerivedMetatype(base)) {
             // Add a useless ".self" to avoid downstream diagnostics.
             base = new (context) DotSelfExpr(base, SourceLoc(), base->getEndLoc(),
@@ -1799,7 +1806,7 @@ namespace {

             auto *closure = buildSingleCurryThunk(
                 base, declRefExpr, cast<AbstractFunctionDecl>(member),
-                memberLocator);
+                memberLocator, isConstructor);

             // Skip the code below -- we're not building an extra level of
             // call by applying the metatype; instead, the closure we just