Reapply r180982 with repaired logic and an additional testcase.
Un-break the gdb buildbot.
- Use the debug location of the return expression for the cleanup code
if the return expression is trivially evaluatable, regardless of the
number of stop points in the function.
- Ensure that any EH code in the cleanup still gets the line number of
the closing } of the lexical scope.
- Added a testcase with EH in the cleanup.
rdar://problem/13442648
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@181056 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGStmt.cpp b/lib/CodeGen/CGStmt.cpp
index 73f66e0..5e2ebe0 100644
--- a/lib/CodeGen/CGStmt.cpp
+++ b/lib/CodeGen/CGStmt.cpp
@@ -38,8 +38,8 @@
Loc = S->getLocStart();
DI->EmitLocation(Builder, Loc);
- if (++NumStopPoints == 1)
- FirstStopPoint = Loc;
+ //if (++NumStopPoints == 1)
+ LastStopPoint = Loc;
}
}
@@ -842,8 +842,9 @@
}
}
+ NumReturnExprs += 1;
if (RV == 0 || RV->isEvaluatable(getContext()))
- ++NumSimpleReturnExprs;
+ NumSimpleReturnExprs += 1;
cleanupScope.ForceCleanup();
EmitBranchThroughCleanup(ReturnBlock);