diff options
author | Adrian Prantl <aprantl@apple.com> | 2013-05-03 00:44:13 +0000 |
---|---|---|
committer | Adrian Prantl <aprantl@apple.com> | 2013-05-03 00:44:13 +0000 |
commit | 30c0d27b61e38ad6038eeb8650f0dac83056c75b (patch) | |
tree | f6a518899d04ca7ea2e2234f452c467eab0e225f /lib/CodeGen/CGStmt.cpp | |
parent | d306a530fca74e40916121f5583e0545e470b3c4 (diff) |
Attempt to 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@180982 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGStmt.cpp')
-rw-r--r-- | lib/CodeGen/CGStmt.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/CodeGen/CGStmt.cpp b/lib/CodeGen/CGStmt.cpp index 73f66e0c8c..5e2ebe0d9c 100644 --- a/lib/CodeGen/CGStmt.cpp +++ b/lib/CodeGen/CGStmt.cpp @@ -38,8 +38,8 @@ void CodeGenFunction::EmitStopPoint(const Stmt *S) { Loc = S->getLocStart(); DI->EmitLocation(Builder, Loc); - if (++NumStopPoints == 1) - FirstStopPoint = Loc; + //if (++NumStopPoints == 1) + LastStopPoint = Loc; } } @@ -842,8 +842,9 @@ void CodeGenFunction::EmitReturnStmt(const ReturnStmt &S) { } } + NumReturnExprs += 1; if (RV == 0 || RV->isEvaluatable(getContext())) - ++NumSimpleReturnExprs; + NumSimpleReturnExprs += 1; cleanupScope.ForceCleanup(); EmitBranchThroughCleanup(ReturnBlock); |