diff options
| author | David Blaikie <dblaikie@gmail.com> | 2014-12-17 18:02:04 +0000 |
|---|---|---|
| committer | David Blaikie <dblaikie@gmail.com> | 2014-12-17 18:02:04 +0000 |
| commit | 06b2c54db9132bc7b6e599c2a3252ea7f2a8b33b (patch) | |
| tree | 1f82c3bcffe8b94b88453af46106a2aae3c897b5 /clang/lib/CodeGen/CGCleanup.cpp | |
| parent | e4c9cf04f5be0547938e5442caa10a3f56073a8f (diff) | |
| download | bcm5719-llvm-06b2c54db9132bc7b6e599c2a3252ea7f2a8b33b.tar.gz bcm5719-llvm-06b2c54db9132bc7b6e599c2a3252ea7f2a8b33b.zip | |
Revert "DebugInfo: Generalize debug info location handling"
Fails an ASan bootstrap - I'll try to reproduce locally & sort that out
before recommitting.
This reverts commit r224385.
llvm-svn: 224441
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(); |
