Merge pull request #3869 from adrian-prantl/25427596

Author: swift-ci

lib/IRGen/IRGenSIL.cpp

@@ -723,6 +723,7 @@ class IRGenSILFunction :
     Alignment align(layout->getAlignment());
 
     auto alloca = createAlloca(aggregateType, align, Name + ".debug");
+    ArtificialLocation AutoRestore(getDebugScope(), IGM.DebugInfo, Builder);
     size_t i = 0;
     for (auto val : vals) {
       auto addr = Builder.CreateStructGEP(alloca, i,

test/DebugInfo/guard-let.swift

@@ -1,4 +1,5 @@
 // RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s
+// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s --check-prefix=CHECK2
 func use<T>(_ t: T) {}
 
 public func f(_ i : Int?)
@@ -14,3 +15,14 @@ public func f(_ i : Int?)
   guard let val = i else { return }
   use(val)
 }
+
+public func g(_ s : String?)
+{
+  // CHECK2: define {{.*}}@_TF4main1gFGSqSS_T_
+  // The shadow copy store should not have a location.
+  // CHECK2: getelementptr inbounds {{.*}} %s.debug, {{.*}}, !dbg ![[DBG0:.*]]
+  // CHECK2: ![[G:.*]] = distinct !DISubprogram(name: "g",
+  // CHECK2: ![[DBG0]] = !DILocation(line: 0, scope: ![[G]])
+  guard let val = s else { return }
+  use(val)
+}