Merge pull request #76668 from swiftlang/gaborh/lifetimebound-off-by-one

[cxx-interop] Fix off-by-one error when importing lifetimebound attrs

Author: Xazax-hun

lib/ClangImporter/ImportDecl.cpp

@@ -3880,7 +3880,7 @@ namespace {
                 ? IndexSubset::get(Impl.SwiftContext,
                                    scopedLifetimeParamIndicesForReturn)
                 : nullptr,
-            swiftParams->size(),
+            swiftParams->size() + hasSelf,
             /*isImmortal*/ false));
       else if (auto *ctordecl = dyn_cast<clang::CXXConstructorDecl>(decl)) {
         // Assume default constructed view types have no dependencies.

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

@@ -35,6 +35,10 @@ struct Owner {
     View handOutView() const [[clang::lifetimebound]] {
         return View(&data);
     }
+
+    View handOutView2(View v) const [[clang::lifetimebound]] {
+        return View(&data);
+    }
 };
 
 Owner makeOwner() {
@@ -78,6 +82,7 @@ private:
 // 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
@@ -93,6 +98,7 @@ public func test() {
     let v2 = getViewFromFirst(o, o2)
     let _ = getViewFromEither(o, o2)
     let _ = o.handOutView()
+    let _ = o.handOutView2(v1)
     let _ = getViewFromEither(v1, v2)
     let defaultView = View()
     let _ = OtherView(defaultView)