Merge remote-tracking branch 'origin/master' into master-next

Author: swift-ci

lib/SILOptimizer/Utils/SILInliner.cpp

@@ -559,15 +559,18 @@ SILValue SILInlineCloner::borrowFunctionArgument(SILValue callArg,
       || callArg.getOwnershipKind() != ValueOwnershipKind::Owned) {
     return callArg;
   }
-  auto *borrow = getBuilder().createBeginBorrow(AI.getLoc(), callArg);
+
+  SILBuilderWithScope beginBuilder(AI.getInstruction(), getBuilder());
+  auto *borrow = beginBuilder.createBeginBorrow(AI.getLoc(), callArg);
   if (auto *tryAI = dyn_cast<TryApplyInst>(AI)) {
-    SILBuilder returnBuilder(tryAI->getNormalBB()->begin());
+    SILBuilderWithScope returnBuilder(tryAI->getNormalBB()->begin());
     returnBuilder.createEndBorrow(AI.getLoc(), borrow, callArg);
 
-    SILBuilder throwBuilder(tryAI->getErrorBB()->begin());
+    SILBuilderWithScope throwBuilder(tryAI->getErrorBB()->begin());
     throwBuilder.createEndBorrow(AI.getLoc(), borrow, callArg);
   } else {
-    SILBuilder returnBuilder(std::next(AI.getInstruction()->getIterator()));
+    SILBuilderWithScope returnBuilder(
+        std::next(AI.getInstruction()->getIterator()));
     returnBuilder.createEndBorrow(AI.getLoc(), borrow, callArg);
   }
   return borrow;

test/DebugInfo/mandatory-inlining-ownership.swift

@@ -0,0 +1,21 @@
+// REQUIRES: objc_interop
+
+// RUN: %target-swift-frontend -emit-sil %s -Onone -Xllvm \
+// RUN:   -sil-print-after=mandatory-inlining \
+// RUN:   -enable-ownership-stripping-after-serialization \
+// RUN:   -Xllvm -sil-print-debuginfo -o /dev/null 2>&1 | %FileCheck %s
+
+// CHECK: begin_borrow {{.*}} : $OSLog, loc {{.*}}, scope 5
+// CHECK: tuple (), loc {{.*}}, scope 5
+// CHECK: end_borrow %9 : $OSLog, loc {{.*}}, scope 5
+
+import os
+
+func bar() {
+  if #available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *) {
+    foo(OSLog.default)
+  }
+}
+
+@_transparent
+func foo(_ logObject: OSLog) { }