diff options
| author | David Blaikie <dblaikie@gmail.com> | 2015-01-09 23:00:28 +0000 |
|---|---|---|
| committer | David Blaikie <dblaikie@gmail.com> | 2015-01-09 23:00:28 +0000 |
| commit | f353d3ecd0329884110a8bd39f28b5cc111c9a69 (patch) | |
| tree | 070b18a0745ca81118c1a5e32351cdcadcceb79e /clang/lib/CodeGen/CGCleanup.cpp | |
| parent | a10379ad49b9a102d9f6ab1bdafba67dc42f430b (diff) | |
| download | bcm5719-llvm-f353d3ecd0329884110a8bd39f28b5cc111c9a69.tar.gz bcm5719-llvm-f353d3ecd0329884110a8bd39f28b5cc111c9a69.zip | |
Revert "DebugInfo: Generalize debug info location handling" and related commits
This reverts commit r225000, r225021, r225083, r225086, r225090.
The root change (r225000) still has several issues where it's caused
calls to be emitted without debug locations. This causes assertion
failures if/when those calls are inlined.
I'll work up some test cases and fixes before recommitting this.
llvm-svn: 225555
Diffstat (limited to 'clang/lib/CodeGen/CGCleanup.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CGCleanup.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CGCleanup.cpp b/clang/lib/CodeGen/CGCleanup.cpp index 18ed3e543d2..d81e3a597b8 100644 --- a/clang/lib/CodeGen/CGCleanup.cpp +++ b/clang/lib/CodeGen/CGCleanup.cpp @@ -861,7 +861,10 @@ void CodeGenFunction::PopCleanupBlock(bool FallthroughIsBranchThrough) { // Emit the EH cleanup if required. if (RequiresEHCleanup) { - ApplyDebugLocation AutoRestoreLocation(*this, CurEHLocation); + CGDebugInfo *DI = getDebugInfo(); + SaveAndRestoreLocation AutoRestoreLocation(*this, Builder); + if (DI) + DI->EmitLocation(Builder, CurEHLocation); CGBuilderTy::InsertPoint SavedIP = Builder.saveAndClearIP(); |
