From: Calixte Denizet Date: Fri, 21 Sep 2018 09:17:06 +0000 (+0000) Subject: [CodeGen] Add to emitted DebugLoc information about coverage when it's required X-Git-Tag: llvmorg-8.0.0-rc1~8265 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5713db4c4af8261b5306e1a6eb1a60625d8b4cc7;p=platform%2Fupstream%2Fllvm.git [CodeGen] Add to emitted DebugLoc information about coverage when it's required Summary: Some lines have a hit counter where they should not have one. Cleanup stuff is located to the last line of the body which is most of the time a '}'. And Exception stuff is added at the beginning of a function and at the end (represented by '{' and '}'). So in such cases, the DebugLoc used in GCOVProfiling.cpp must be marked as not covered. This patch is a followup of https://reviews.llvm.org/D49915. Tests in projects/compiler_rt are fixed by: https://reviews.llvm.org/D49917 Reviewers: marco-c, davidxl Reviewed By: marco-c Subscribers: dblaikie, cfe-commits, sylvestre.ledru Differential Revision: https://reviews.llvm.org/D49916 llvm-svn: 342717 --- diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp index 7d6eb83..216a12b 100644 --- a/clang/lib/CodeGen/CGDebugInfo.cpp +++ b/clang/lib/CodeGen/CGDebugInfo.cpp @@ -76,20 +76,22 @@ CGDebugInfo::~CGDebugInfo() { } ApplyDebugLocation::ApplyDebugLocation(CodeGenFunction &CGF, - SourceLocation TemporaryLocation) + SourceLocation TemporaryLocation, + bool ImplicitCode) : CGF(&CGF) { - init(TemporaryLocation); + init(TemporaryLocation, false /* DefaultToEmpty */, ImplicitCode); } ApplyDebugLocation::ApplyDebugLocation(CodeGenFunction &CGF, bool DefaultToEmpty, - SourceLocation TemporaryLocation) + SourceLocation TemporaryLocation, + bool ImplicitCode) : CGF(&CGF) { - init(TemporaryLocation, DefaultToEmpty); + init(TemporaryLocation, DefaultToEmpty, ImplicitCode); } void ApplyDebugLocation::init(SourceLocation TemporaryLocation, - bool DefaultToEmpty) { + bool DefaultToEmpty, bool ImplicitCode) { auto *DI = CGF->getDebugInfo(); if (!DI) { CGF = nullptr; @@ -102,7 +104,7 @@ void ApplyDebugLocation::init(SourceLocation TemporaryLocation, return; if (TemporaryLocation.isValid()) { - DI->EmitLocation(CGF->Builder, TemporaryLocation); + DI->EmitLocation(CGF->Builder, TemporaryLocation, ImplicitCode); return; } @@ -3484,7 +3486,8 @@ void CGDebugInfo::EmitInlineFunctionEnd(CGBuilderTy &Builder) { setInlinedAt(llvm::DebugLoc(CurInlinedAt).getInlinedAt()); } -void CGDebugInfo::EmitLocation(CGBuilderTy &Builder, SourceLocation Loc) { +void CGDebugInfo::EmitLocation(CGBuilderTy &Builder, SourceLocation Loc, + bool ImplicitCode) { // Update our current location setLocation(Loc); @@ -3492,8 +3495,9 @@ void CGDebugInfo::EmitLocation(CGBuilderTy &Builder, SourceLocation Loc) { return; llvm::MDNode *Scope = LexicalBlockStack.back(); - Builder.SetCurrentDebugLocation(llvm::DebugLoc::get( - getLineNumber(CurLoc), getColumnNumber(CurLoc), Scope, CurInlinedAt)); + Builder.SetCurrentDebugLocation( + llvm::DebugLoc::get(getLineNumber(CurLoc), getColumnNumber(CurLoc), Scope, + CurInlinedAt, ImplicitCode)); } void CGDebugInfo::CreateLexicalBlock(SourceLocation Loc) { @@ -3540,7 +3544,7 @@ void CGDebugInfo::EmitLexicalBlockEnd(CGBuilderTy &Builder, assert(!LexicalBlockStack.empty() && "Region stack mismatch, stack empty!"); // Provide an entry in the line table for the end of the block. - EmitLocation(Builder, Loc); + EmitLocation(Builder, Loc, true /* ImplicitCode */); if (DebugKind <= codegenoptions::DebugLineTablesOnly) return; @@ -3556,7 +3560,7 @@ void CGDebugInfo::EmitFunctionEnd(CGBuilderTy &Builder, llvm::Function *Fn) { // Pop all regions for this function. while (LexicalBlockStack.size() != RCount) { // Provide an entry in the line table for the end of the block. - EmitLocation(Builder, CurLoc); + EmitLocation(Builder, CurLoc, true /* ImplicitCode */); LexicalBlockStack.pop_back(); } FnBeginRegionCount.pop_back(); diff --git a/clang/lib/CodeGen/CGDebugInfo.h b/clang/lib/CodeGen/CGDebugInfo.h index 8641c2d..6bffc74 100644 --- a/clang/lib/CodeGen/CGDebugInfo.h +++ b/clang/lib/CodeGen/CGDebugInfo.h @@ -377,7 +377,9 @@ public: /// Emit metadata to indicate a change in line/column information in /// the source file. If the location is invalid, the previous /// location will be reused. - void EmitLocation(CGBuilderTy &Builder, SourceLocation Loc); + /// \param ImplicitCode True if the Loc must have coverage information + void EmitLocation(CGBuilderTy &Builder, SourceLocation Loc, + bool ImplicitCode = false); /// Emit a call to llvm.dbg.function.start to indicate /// start of a new function. @@ -664,16 +666,19 @@ private: /// location or preferred location of the specified Expr. class ApplyDebugLocation { private: - void init(SourceLocation TemporaryLocation, bool DefaultToEmpty = false); + void init(SourceLocation TemporaryLocation, bool DefaultToEmpty = false, + bool ImplicitCode = false); ApplyDebugLocation(CodeGenFunction &CGF, bool DefaultToEmpty, - SourceLocation TemporaryLocation); + SourceLocation TemporaryLocation, + bool ImplicitCode = false); llvm::DebugLoc OriginalLocation; CodeGenFunction *CGF; public: /// Set the location to the (valid) TemporaryLocation. - ApplyDebugLocation(CodeGenFunction &CGF, SourceLocation TemporaryLocation); + ApplyDebugLocation(CodeGenFunction &CGF, SourceLocation TemporaryLocation, + bool ImplicitCode = false); ApplyDebugLocation(CodeGenFunction &CGF, const Expr *E); ApplyDebugLocation(CodeGenFunction &CGF, llvm::DebugLoc Loc); ApplyDebugLocation(ApplyDebugLocation &&Other) : CGF(Other.CGF) { @@ -696,13 +701,15 @@ public: static ApplyDebugLocation CreateArtificial(CodeGenFunction &CGF) { return ApplyDebugLocation(CGF, false, SourceLocation()); } + /// Apply TemporaryLocation if it is valid. Otherwise switch /// to an artificial debug location that has a valid scope, but no /// line information. static ApplyDebugLocation CreateDefaultArtificial(CodeGenFunction &CGF, - SourceLocation TemporaryLocation) { - return ApplyDebugLocation(CGF, false, TemporaryLocation); + SourceLocation TemporaryLocation, + bool ImplicitCode = false) { + return ApplyDebugLocation(CGF, false, TemporaryLocation, ImplicitCode); } /// Set the IRBuilder to not attach debug locations. Note that diff --git a/clang/lib/CodeGen/CGException.cpp b/clang/lib/CodeGen/CGException.cpp index 4ee8352..787d25a 100644 --- a/clang/lib/CodeGen/CGException.cpp +++ b/clang/lib/CodeGen/CGException.cpp @@ -767,7 +767,8 @@ llvm::BasicBlock *CodeGenFunction::EmitLandingPad() { // Save the current IR generation state. CGBuilderTy::InsertPoint savedIP = Builder.saveAndClearIP(); - auto DL = ApplyDebugLocation::CreateDefaultArtificial(*this, CurEHLocation); + auto DL = ApplyDebugLocation::CreateDefaultArtificial( + *this, CurEHLocation, true /* ImplicitCode */); // Create and configure the landing pad. llvm::BasicBlock *lpad = createBasicBlock("lpad"); diff --git a/clang/lib/CodeGen/CodeGenFunction.cpp b/clang/lib/CodeGen/CodeGenFunction.cpp index 77f978f..8fa0bad 100644 --- a/clang/lib/CodeGen/CodeGenFunction.cpp +++ b/clang/lib/CodeGen/CodeGenFunction.cpp @@ -317,7 +317,7 @@ void CodeGenFunction::FinishFunction(SourceLocation EndLoc) { if (OnlySimpleReturnStmts) DI->EmitLocation(Builder, LastStopPoint); else - DI->EmitLocation(Builder, EndLoc); + DI->EmitLocation(Builder, EndLoc, true /* ImplicitCode */); } // Pop any cleanups that might have been associated with the @@ -333,7 +333,7 @@ void CodeGenFunction::FinishFunction(SourceLocation EndLoc) { // the ret after it's been at EndLoc. if (CGDebugInfo *DI = getDebugInfo()) if (OnlySimpleReturnStmts) - DI->EmitLocation(Builder, EndLoc); + DI->EmitLocation(Builder, EndLoc, true /* ImplicitCode */); PopCleanupBlocks(PrologueCleanupDepth); } @@ -1179,7 +1179,7 @@ void CodeGenFunction::StartFunction(GlobalDecl GD, } // Emit a location at the end of the prologue. if (CGDebugInfo *DI = getDebugInfo()) - DI->EmitLocation(Builder, StartLoc); + DI->EmitLocation(Builder, StartLoc, true /* ImplicitCode */); // TODO: Do we need to handle this in two places like we do with // target-features/target-cpu? diff --git a/clang/lib/CodeGen/CodeGenFunction.h b/clang/lib/CodeGen/CodeGenFunction.h index 6ea2d75..7a5e308 100644 --- a/clang/lib/CodeGen/CodeGenFunction.h +++ b/clang/lib/CodeGen/CodeGenFunction.h @@ -786,7 +786,7 @@ public: // If we should perform a cleanup, force them now. Note that // this ends the cleanup scope before rescoping any labels. if (PerformCleanup) { - ApplyDebugLocation DL(CGF, Range.getEnd()); + ApplyDebugLocation DL(CGF, Range.getEnd(), true /* ImplicitCode */); ForceCleanup(); } } diff --git a/clang/test/CodeGen/debug-info-scope-file.c b/clang/test/CodeGen/debug-info-scope-file.c index 94123bb..cc38449f 100644 --- a/clang/test/CodeGen/debug-info-scope-file.c +++ b/clang/test/CodeGen/debug-info-scope-file.c @@ -5,10 +5,11 @@ // CHECK: ret void, !dbg [[F1_LINE:![0-9]*]] // CHECK: ret void, !dbg [[F2_LINE:![0-9]*]] -// CHECK: [[F1:![0-9]*]] = distinct !DISubprogram(name: "f1",{{.*}} isDefinition: true -// CHECK: [[F1_LINE]] = !DILocation({{.*}}, scope: [[F1]]) -// CHECK: [[F2:![0-9]*]] = distinct !DISubprogram(name: "f2",{{.*}} isDefinition: true -// CHECK: [[F2_LINE]] = !DILocation({{.*}}, scope: [[F2]]) +// CHECK: [[F1:![0-9]*]] = distinct !DISubprogram(name: "f1",{{.*}} +// isDefinition: true CHECK: [[F1_LINE]] = !DILocation({{.*}}, scope: [[F1]], +// isImplicitCode: true) CHECK: [[F2:![0-9]*]] = distinct !DISubprogram(name: +// "f2",{{.*}} isDefinition: true CHECK: [[F2_LINE]] = !DILocation({{.*}}, +// scope: [[F2]], isImplicitCode: true) void f1() { } diff --git a/clang/test/CodeGenCXX/debug-info-inheriting-constructor.cpp b/clang/test/CodeGenCXX/debug-info-inheriting-constructor.cpp index 8e47a0d..728a193 100644 --- a/clang/test/CodeGenCXX/debug-info-inheriting-constructor.cpp +++ b/clang/test/CodeGenCXX/debug-info-inheriting-constructor.cpp @@ -21,5 +21,5 @@ void foo() { // CHECK-DAG: ![[LOC]] = !DILocation(line: 0, scope: ![[A]], inlinedAt: ![[INL:[0-9]+]]) // CHECK-DAG: ![[INL]] = !DILocation(line: [[@LINE+1]], scope: ![[FOO]]) B b(0); -// CHECK: ![[NOINL]] = !DILocation(line: [[@LINE+1]], scope: !{{[0-9]+}}) + // CHECK: ![[NOINL]] = !DILocation(line: [[@LINE+1]], scope: !{{[0-9]+}}, isImplicitCode: true) } diff --git a/clang/test/CodeGenCXX/linetable-virtual-variadic.cpp b/clang/test/CodeGenCXX/linetable-virtual-variadic.cpp index 60dee5f..154ee30 100644 --- a/clang/test/CodeGenCXX/linetable-virtual-variadic.cpp +++ b/clang/test/CodeGenCXX/linetable-virtual-variadic.cpp @@ -17,6 +17,6 @@ void Derived::VariadicFunction(...) { } // CHECK: ret void, !dbg ![[LOC_I:[0-9]+]] // // CHECK: ![[SP]] = distinct !DISubprogram(name: "VariadicFunction" -// CHECK: ![[LOC]] = !DILocation({{.*}}scope: ![[SP]]) +// CHECK: ![[LOC]] = !DILocation({{.*}}scope: ![[SP]], isImplicitCode: true) // CHECK: ![[SP_I]] = distinct !DISubprogram(name: "VariadicFunction" -// CHECK: ![[LOC_I]] = !DILocation({{.*}}scope: ![[SP_I]]) +// CHECK: ![[LOC_I]] = !DILocation({{.*}}scope: ![[SP_I]], isImplicitCode: true) diff --git a/clang/test/CodeGenObjC/arc-linetable.m b/clang/test/CodeGenObjC/arc-linetable.m index 877dfdc..5e23d33 100644 --- a/clang/test/CodeGenObjC/arc-linetable.m +++ b/clang/test/CodeGenObjC/arc-linetable.m @@ -60,7 +60,7 @@ typedef signed char BOOL; - (int)testNoSideEffect:(NSString *)foo { int x = 1; return 1; // Return expression - // CHECK: ![[RET1]] = !DILocation(line: [[@LINE+1]], scope: ![[TESTNOSIDEEFFECT]]) + // CHECK: ![[RET1]] = !DILocation(line: [[@LINE+1]], scope: ![[TESTNOSIDEEFFECT]], isImplicitCode: true) } // Cleanup + Ret - (int)testNoCleanup { diff --git a/clang/test/CodeGenObjC/debug-info-blocks.m b/clang/test/CodeGenObjC/debug-info-blocks.m index b6e5b42..4116662 100644 --- a/clang/test/CodeGenObjC/debug-info-blocks.m +++ b/clang/test/CodeGenObjC/debug-info-blocks.m @@ -18,11 +18,9 @@ // CHECK: call {{.*}}, !dbg ![[DBG_LINE:[0-9]+]] // CHECK-NOT: ret // CHECK: load {{.*}}, !dbg ![[COPY_LINE:[0-9]+]] -// CHECK: ret void, !dbg ![[COPY_LINE]] // CHECK: define {{.*}} @__destroy_helper_block_{{.*}}(i8*) // CHECK-NOT: ret // CHECK: load {{.*}}, !dbg ![[DESTROY_LINE:[0-9]+]] -// CHECK: ret void, !dbg ![[DESTROY_LINE]] typedef unsigned int NSUInteger;