Merge pull request #15929 from vedantk/retn-loc

Author: swift-ci

lib/IRGen/IRGenDebugInfo.cpp

@@ -125,7 +125,7 @@ class IRGenDebugInfoImpl : public IRGenDebugInfo {
   void finalize();
 
   void setCurrentLoc(IRBuilder &Builder, const SILDebugScope *DS,
-                     Optional<SILLocation> Loc = None);
+                     SILLocation Loc);
   void clearLoc(IRBuilder &Builder);
   void pushLoc();
   void popLoc();
@@ -1555,7 +1555,7 @@ void IRGenDebugInfoImpl::finalize() {
 
 void IRGenDebugInfoImpl::setCurrentLoc(IRBuilder &Builder,
                                        const SILDebugScope *DS,
-                                       Optional<SILLocation> Loc) {
+                                       SILLocation Loc) {
   assert(DS && "empty scope");
   auto *Scope = getOrCreateScope(DS);
   if (!Scope)
@@ -1565,7 +1565,7 @@ void IRGenDebugInfoImpl::setCurrentLoc(IRBuilder &Builder,
   SILFunction *Fn = DS->getInlinedFunction();
   if (Fn && Fn->isThunk()) {
     L = SILLocation::getCompilerGeneratedDebugLoc();
-  } else if (DS == LastScope && Loc && Loc->isAutoGenerated()) {
+  } else if (DS == LastScope && Loc.isAutoGenerated()) {
     // Reuse the last source location if we are still in the same
     // scope to get a more contiguous line table.
     L = LastDebugLoc;
@@ -1574,7 +1574,7 @@ void IRGenDebugInfoImpl::setCurrentLoc(IRBuilder &Builder,
     L = getDebugLocation(Loc);
     // Otherwise use a line 0 artificial location, but the file from the
     // location.
-    if (Loc && Loc->isAutoGenerated()) {
+    if (Loc.isAutoGenerated()) {
       L.Line = 0;
       L.Column = 0;
     }
@@ -2056,7 +2056,7 @@ void IRGenDebugInfo::finalize() {
 }
 
 void IRGenDebugInfo::setCurrentLoc(IRBuilder &Builder, const SILDebugScope *DS,
-                                   Optional<SILLocation> Loc) {
+                                   SILLocation Loc) {
   static_cast<IRGenDebugInfoImpl *>(this)->setCurrentLoc(Builder, DS, Loc);
 }
 

lib/IRGen/IRGenDebugInfo.h

@@ -57,7 +57,7 @@ class IRGenDebugInfo {
   /// Update the IRBuilder's current debug location to the location
   /// Loc and the lexical scope DS.
   void setCurrentLoc(IRBuilder &Builder, const SILDebugScope *DS,
-                     Optional<SILLocation> Loc = None);
+                     SILLocation Loc);
 
   void clearLoc(IRBuilder &Builder);
 

lib/IRGen/IRGenSIL.cpp

@@ -1789,8 +1789,11 @@ void IRGenSILFunction::visitSILBasicBlock(SILBasicBlock *BB) {
         auto Prev = --I.getIterator();
         if (Prev != BB->end())
           DS = Prev->getDebugScope();
-        // Use an artificial (line 0) location.
-        IGM.DebugInfo->setCurrentLoc(Builder, DS);
+
+        // Use an artificial (line 0) location, to indicate we'd like to
+        // reuse the last debug loc.
+        IGM.DebugInfo->setCurrentLoc(
+            Builder, DS, RegularLocation::getAutoGeneratedLocation());
       }
 
       if (isa<TermInst>(&I))

test/DebugInfo/returnlocation.swift

@@ -178,3 +178,18 @@ public func cleanup_simple_complex(_ a: NSString) -> Int64 {
 }
 
 // ---------------------------------------------------------------------
+
+// RUN: %FileCheck %s --check-prefix=CHECK_INIT < %t.ll
+// CHECK_INIT: define {{.*}}$S4main6Class1CACSgycfc
+public class Class1 {
+  public required init?() {
+    print("hello")
+    // CHECK_INIT: call {{.*}}@"$Ss5print_9separator10terminatoryypd_S2StF"{{.*}}, !dbg [[printLoc:![0-9]+]]
+    // CHECK_INIT-NEXT: call void @swift_bridgeObjectRelease{{.*}}, !dbg [[retnLoc:![0-9]+]]
+    // CHECK_INIT: br label {{.*}}, !dbg [[retnLoc]]
+
+    // CHECK_INIT: [[printLoc]] = !DILocation(line: [[@LINE-5]]
+    // CHECK_INIT: [[retnLoc]] = !DILocation(line: [[@LINE+1]]
+    return nil
+  }
+}