Merge pull request #32534 from zoecarver/fix/cxx/constructor-return-stmt

Author: swift-ci

lib/ClangImporter/ImportDecl.cpp

@@ -1272,11 +1272,7 @@ synthesizeStructDefaultConstructorBody(AbstractFunctionDecl *afd,
   auto assign = new (ctx) AssignExpr(lhs, SourceLoc(), call, /*implicit*/ true);
   assign->setType(emptyTuple);
 
-  auto result = TupleExpr::createEmpty(ctx, SourceLoc(), SourceLoc(),
-                                       /*Implicit=*/true);
-  result->setType(emptyTuple);
-
-  auto ret = new (ctx) ReturnStmt(SourceLoc(), result, /*Implicit=*/true);
+  auto ret = new (ctx) ReturnStmt(SourceLoc(), nullptr, /*Implicit=*/true);
 
   // Create the function body.
   auto body = BraceStmt::create(ctx, SourceLoc(), {assign, ret}, SourceLoc());

validation-test/SILGen/Inputs/cxx-types.h

@@ -0,0 +1,3 @@
+struct HasCustomCopyConst {
+  HasCustomCopyConst(HasCustomCopyConst const&) { }
+};

validation-test/SILGen/Inputs/module.modulemap

@@ -0,0 +1,3 @@
+module CXXTypes {
+  header "cxx-types.h"
+}

validation-test/SILGen/cxx-address-only-object-init.swift

@@ -0,0 +1,12 @@
+// RUN: %target-swift-frontend -enable-cxx-interop -I %S/Inputs %s -emit-silgen | %FileCheck %s
+
+import CXXTypes
+
+// Just make sure we create the object and don't crash.
+// CHECK-LABEL: @$s4main4testyyF
+// CHECK: alloc_stack
+// CHECK: apply
+// CHECK: return %{{[0-9]+}} : $()
+public func test() {
+  let c = HasCustomCopyConst()
+}