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
diff --git a/clang/lib/CodeGen/CGStmt.cpp b/clang/lib/CodeGen/CGStmt.cpp
index 2e43125..a003e8a 100644
--- a/clang/lib/CodeGen/CGStmt.cpp
+++ b/clang/lib/CodeGen/CGStmt.cpp
@@ -565,7 +565,7 @@
if (const Stmt *Else = S.getElse()) {
{
// There is no need to emit line number for unconditional branch.
- ApplyDebugLocation DL(*this);
+ SuppressDebugLocation S(Builder);
EmitBlock(ElseBlock);
}
{
@@ -574,7 +574,7 @@
}
{
// There is no need to emit line number for unconditional branch.
- ApplyDebugLocation DL(*this);
+ SuppressDebugLocation S(Builder);
EmitBranch(ContBlock);
}
}