Debug Info: Fix an oversight of r186553. Ensure that the function prologue
of an artificial function gets an artificial location as well.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@187074 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGBlocks.cpp b/lib/CodeGen/CGBlocks.cpp
index ec4af58..f200ec9 100644
--- a/lib/CodeGen/CGBlocks.cpp
+++ b/lib/CodeGen/CGBlocks.cpp
@@ -1313,9 +1313,10 @@
SC_Static,
false,
false);
- StartFunction(FD, C.VoidTy, Fn, FI, args, SourceLocation());
- // Don't emit any line table entries for the body of this function.
+ // Create a scope with an artificial location for the body of this function.
ArtificialLocation AL(*this, Builder);
+ StartFunction(FD, C.VoidTy, Fn, FI, args, SourceLocation());
+ AL.Emit();
llvm::Type *structPtrTy = blockInfo.StructureType->getPointerTo();
@@ -1488,9 +1489,10 @@
SourceLocation(), II, C.VoidTy, 0,
SC_Static,
false, false);
- StartFunction(FD, C.VoidTy, Fn, FI, args, SourceLocation());
- // Don't emit any line table entries for the body of this function.
+ // Create a scope with an artificial location for the body of this function.
ArtificialLocation AL(*this, Builder);
+ StartFunction(FD, C.VoidTy, Fn, FI, args, SourceLocation());
+ AL.Emit();
llvm::Type *structPtrTy = blockInfo.StructureType->getPointerTo();
diff --git a/lib/CodeGen/CGDebugInfo.cpp b/lib/CodeGen/CGDebugInfo.cpp
index 4de21d2..4e77f87 100644
--- a/lib/CodeGen/CGDebugInfo.cpp
+++ b/lib/CodeGen/CGDebugInfo.cpp
@@ -72,13 +72,19 @@
: DI(CGF.getDebugInfo()), Builder(B) {
if (DI) {
SavedLoc = DI->getLocation();
+ DI->CurLoc = SourceLocation();
+ Builder.SetCurrentDebugLocation(llvm::DebugLoc());
+ }
+}
+
+void ArtificialLocation::Emit() {
+ if (DI) {
// Sync the Builder.
DI->EmitLocation(Builder, SavedLoc);
DI->CurLoc = SourceLocation();
// Construct a location that has a valid scope, but no line info.
- llvm::DIDescriptor Scope = DI->LexicalBlockStack.empty() ?
- llvm::DIDescriptor(DI->TheCU) :
- llvm::DIDescriptor(DI->LexicalBlockStack.back());
+ assert(!DI->LexicalBlockStack.empty());
+ llvm::DIDescriptor Scope(DI->LexicalBlockStack.back());
Builder.SetCurrentDebugLocation(llvm::DebugLoc::get(0, 0, Scope));
}
}
diff --git a/lib/CodeGen/CGDebugInfo.h b/lib/CodeGen/CGDebugInfo.h
index 6eeb911..b090c4d 100644
--- a/lib/CodeGen/CGDebugInfo.h
+++ b/lib/CodeGen/CGDebugInfo.h
@@ -407,9 +407,11 @@
/// an artificial debug location that has a valid scope, but no line
/// information. This is useful when emitting compiler-generated
/// helper functions that have no source location associated with
-/// them.
+/// them. The DWARF specification allows the compiler to use the
+/// special line number 0 to indicate code that can not be attributed
+/// to any source location.
///
-/// This is necessary because pasing an empty SourceLocation to
+/// This is necessary because passing an empty SourceLocation to
/// CGDebugInfo::setLocation() will result in the last valid location
/// being reused.
class ArtificialLocation {
@@ -418,7 +420,12 @@
CGBuilderTy &Builder;
public:
ArtificialLocation(CodeGenFunction &CGF, CGBuilderTy &B);
- /// ~BuildinLocation - Autorestore everything back to normal.
+
+ /// Set the current location to line 0, but within the current scope
+ /// (= the top of the LexicalScopeStack).
+ void Emit();
+
+ /// ~ArtificialLocation - Autorestore everything back to normal.
~ArtificialLocation();
};