diff options
| author | David Blaikie <dblaikie@gmail.com> | 2014-12-29 23:49:00 +0000 |
|---|---|---|
| committer | David Blaikie <dblaikie@gmail.com> | 2014-12-29 23:49:00 +0000 |
| commit | 608a24501c73ee2384464fa1c1703e28116d05f3 (patch) | |
| tree | d99f56fc9d07ecdd2e2af2044f4ea3c8a566e04c /clang/lib/CodeGen/CGException.cpp | |
| parent | b7373cd6398eee6a35d20a623bb6fb06f5414dc0 (diff) | |
| download | bcm5719-llvm-608a24501c73ee2384464fa1c1703e28116d05f3.tar.gz bcm5719-llvm-608a24501c73ee2384464fa1c1703e28116d05f3.zip | |
Revert "DebugInfo: Generalize debug info location handling"
Asserting when building compiler-rt when using a GCC host compiler.
Reverting while I investigate.
This reverts commit r224941.
llvm-svn: 224970
Diffstat (limited to 'clang/lib/CodeGen/CGException.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CGException.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CGException.cpp b/clang/lib/CodeGen/CGException.cpp index 4b57533c609..fa89033bb0f 100644 --- a/clang/lib/CodeGen/CGException.cpp +++ b/clang/lib/CodeGen/CGException.cpp @@ -734,7 +734,9 @@ llvm::BasicBlock *CodeGenFunction::EmitLandingPad() { // Save the current IR generation state. CGBuilderTy::InsertPoint savedIP = Builder.saveAndClearIP(); - ApplyDebugLocation AutoRestoreLocation(*this, CurEHLocation); + SaveAndRestoreLocation AutoRestoreLocation(*this, Builder); + if (CGDebugInfo *DI = getDebugInfo()) + DI->EmitLocation(Builder, CurEHLocation); const EHPersonality &personality = EHPersonality::get(CGM); |
