Fix the line info for return statements (#28327)

Fixes the line info for return statements when they are normalized. This
fixes an issue where the debug info for `return` would be generated as
being at the beginning of the function, not the end.

Future work should investigate and ensure proper debug info for multiple
returns.

- [x] paratest

[Reviewed by @dlongnecke-cray]

Author: jabraham17

compiler/codegen/cg-expr.cpp

@@ -192,9 +192,9 @@ GenRet SymExpr::codegen() {
   if (id == breakOnCodegenID)
     debuggerBreakHere();
 
-  if (outfile) {
-    if (getStmtExpr() && getStmtExpr() == this) codegenStmt(this);
-  }
+  if (getStmtExpr() == this)
+    codegenStmt(this);
+
 
   if (auto fn = toFnSymbol(var)) {
     if (shouldGenerateAsIfCallingDirectly(this, fn)) {
@@ -4393,7 +4393,8 @@ GenRet CallExpr::codegen() {
   // Note (for debugging), function name is in parentSymbol->cname.
   if (id == breakOnCodegenID) debuggerBreakHere();
 
-  if (getStmtExpr() == this) codegenStmt(this);
+  if (getStmtExpr() == this)
+    codegenStmt(this);
 
   INT_ASSERT(fn || primitive != nullptr || this->isIndirectCall());
   bool canGenerate = (fn && !fn->hasFlag(FLAG_NO_CODEGEN)) ||

compiler/codegen/cg-stmt.cpp

@@ -62,7 +62,7 @@ void codegenStmt(Expr* stmt) {
       // Adjust the current line number, but leave the scope alone.
       llvm::MDNode* scope;
 
-      if(auto fn = toFnSymbol(stmt->parentSymbol); stmt->inTree()) {
+      if (auto fn = toFnSymbol(stmt->parentSymbol); stmt->inTree()) {
         scope = debugInfo->getFunction(fn);
       } else {
         scope = info->irBuilder->getCurrentDebugLocation().getScope();

compiler/passes/normalize.cpp

@@ -1928,7 +1928,7 @@ static void normalizeReturns(FnSymbol* fn) {
   if (fn->hasFlag(FLAG_NO_FN_BODY)) return;
   if (shouldSkipNormalizing(fn)) return;
 
-  SET_LINENO(fn);
+  SET_LINENO((fn->body->body.tail ? (BaseAST*)fn->body->body.tail : (BaseAST*)fn));
 
   fixupExportedArrayReturns(fn);
   fixupGenericReturnTypes(fn);

test/classes/delete-free/tests-from-design-overview/lifetime-checking.good

@@ -1,5 +1,5 @@
 lifetime-checking.chpl:11: In function 'test':
-lifetime-checking.chpl:11: error: Illegal return of dead value
+lifetime-checking.chpl:16: error: Illegal return of dead value
 lifetime-checking.chpl:16: note: 'a' is dead due to deinitialization here
 lifetime-checking.chpl:16: error: Scoped variable c cannot be returned
 lifetime-checking.chpl:12: note: consider scope of a

test/functions/resolution/array-in-scalar-ret-by-ref.good

@@ -1,4 +1,4 @@
 array-in-scalar-ret-by-ref.chpl:4: In method 'getArrayElt':
 array-in-scalar-ret-by-ref.chpl:5: error: Initializing a reference with another type
-array-in-scalar-ret-by-ref.chpl:4: note: Reference has type int(64)
+array-in-scalar-ret-by-ref.chpl:5: note: Reference has type int(64)
 array-in-scalar-ret-by-ref.chpl:5: note: Initializing with type [domain(1,int(64),one)] int(64)

test/variables/ref/errors-type-mismatch-fn-1.good

@@ -1,4 +1,4 @@
 errors-type-mismatch-fn-1.chpl:6: In method 'this':
 errors-type-mismatch-fn-1.chpl:7: error: Initializing a reference with another type
-errors-type-mismatch-fn-1.chpl:6: note: Reference has type real(64)
+errors-type-mismatch-fn-1.chpl:7: note: Reference has type real(64)
 errors-type-mismatch-fn-1.chpl:7: note: Initializing with type int(64)

test/variables/ref/errors-type-mismatch-fn-2.good

@@ -1,4 +1,4 @@
 errors-type-mismatch-fn-2.chpl:4: In method 'this':
 errors-type-mismatch-fn-2.chpl:5: error: Initializing a reference with another type
-errors-type-mismatch-fn-2.chpl:4: note: Reference has type real(64)
+errors-type-mismatch-fn-2.chpl:5: note: Reference has type real(64)
 errors-type-mismatch-fn-2.chpl:5: note: Initializing with type int(64)