[cxx-interop] Add test for lifetimebound annotation in ctor

There was also an off by one error in this case.

Author: Gabor Horvath

lib/ClangImporter/ImportDecl.cpp

@@ -3847,7 +3847,7 @@ namespace {
         return;
 
       auto swiftParams = result->getParameters();
-      bool hasSelf = result->hasImplicitSelfDecl();
+      bool hasSelf = result->hasImplicitSelfDecl() && !isa<ConstructorDecl>(result);
       SmallVector<LifetimeDependenceInfo, 1> lifetimeDependencies;
       SmallBitVector inheritLifetimeParamIndicesForReturn(swiftParams->size() +
                                                           hasSelf);

test/Interop/Cxx/class/nonescapable-lifetimebound.swift

@@ -16,6 +16,15 @@ struct SWIFT_NONESCAPABLE View {
     View() : member(nullptr) {}
     View(const int *p [[clang::lifetimebound]]) : member(p) {}
     View(const View&) = default;
+private:
+    const int *member;
+    friend struct OtherView;
+};
+
+struct SWIFT_NONESCAPABLE OtherView {
+    OtherView() : member(nullptr) {}
+    OtherView(View v [[clang::lifetimebound]]) : member(v.member) {}
+    OtherView(const OtherView&) = default;
 private:
     const int *member;
 };
@@ -68,14 +77,15 @@ private:
     const int *member;
 };
 
-// CHECK: sil [clang makeOwner] {{.*}}: $@convention(c) () -> Owner
+// CHECK: sil [clang makeOwner] {{.*}} : $@convention(c) () -> Owner
 // CHECK: sil [clang getView] {{.*}} : $@convention(c) (@in_guaranteed Owner) -> _scope(0) @autoreleased View
 // CHECK: sil [clang getViewFromFirst] {{.*}} : $@convention(c) (@in_guaranteed Owner, @in_guaranteed Owner) -> _scope(0) @autoreleased View
 // CHECK: sil [clang getViewFromEither] {{.*}} : $@convention(c) (@in_guaranteed Owner, @in_guaranteed Owner) -> _scope(0, 1) @autoreleased View
 // CHECK: sil [clang Owner.handOutView] {{.*}} : $@convention(cxx_method) (@in_guaranteed Owner) -> _scope(0) @autoreleased View
 // CHECK: sil [clang Owner.handOutView2] {{.*}} : $@convention(cxx_method) (View, @in_guaranteed Owner) -> _scope(1) @autoreleased View
 // CHECK: sil [clang getViewFromEither] {{.*}} : $@convention(c) (@guaranteed View, @guaranteed View) -> _inherit(0, 1) @autoreleased View
 // CHECK: sil [clang View.init] {{.*}} : $@convention(c) () -> @out View
+// CHECK: sil [clang OtherView.init] {{.*}} : $@convention(c) (@guaranteed View) -> _inherit(0) @out OtherView
 
 //--- test.swift
 
@@ -91,4 +101,5 @@ public func test() {
     let _ = o.handOutView2(v1)
     let _ = getViewFromEither(v1, v2)
     let defaultView = View()
+    let _ = OtherView(defaultView)
 }