From fcd661d2786b7915919e5422da37a9539cc44882 Mon Sep 17 00:00:00 2001 From: Calixte Denizet Date: Mon, 24 Sep 2018 18:24:18 +0000 Subject: [PATCH] [CodeGen] Revert commit https://reviews.llvm.org/rL342717 llvm-svn: 342912 --- clang/lib/CodeGen/CGDebugInfo.cpp | 26 +++++++++------------- clang/lib/CodeGen/CGDebugInfo.h | 19 +++++----------- clang/lib/CodeGen/CGException.cpp | 3 +-- clang/lib/CodeGen/CodeGenFunction.cpp | 6 ++--- clang/lib/CodeGen/CodeGenFunction.h | 2 +- clang/test/CodeGen/debug-info-scope-file.c | 9 ++++---- .../debug-info-inheriting-constructor.cpp | 2 +- .../test/CodeGenCXX/linetable-virtual-variadic.cpp | 4 ++-- clang/test/CodeGenObjC/arc-linetable.m | 2 +- clang/test/CodeGenObjC/debug-info-blocks.m | 2 ++ 10 files changed, 32 insertions(+), 43 deletions(-) diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp index 216a12b..7d6eb83 100644 --- a/clang/lib/CodeGen/CGDebugInfo.cpp +++ b/clang/lib/CodeGen/CGDebugInfo.cpp @@ -76,22 +76,20 @@ CGDebugInfo::~CGDebugInfo() { } ApplyDebugLocation::ApplyDebugLocation(CodeGenFunction &CGF, - SourceLocation TemporaryLocation, - bool ImplicitCode) + SourceLocation TemporaryLocation) : CGF(&CGF) { - init(TemporaryLocation, false /* DefaultToEmpty */, ImplicitCode); + init(TemporaryLocation); } ApplyDebugLocation::ApplyDebugLocation(CodeGenFunction &CGF, bool DefaultToEmpty, - SourceLocation TemporaryLocation, - bool ImplicitCode) + SourceLocation TemporaryLocation) : CGF(&CGF) { - init(TemporaryLocation, DefaultToEmpty, ImplicitCode); + init(TemporaryLocation, DefaultToEmpty); } void ApplyDebugLocation::init(SourceLocation TemporaryLocation, - bool DefaultToEmpty, bool ImplicitCode) { + bool DefaultToEmpty) { auto *DI = CGF->getDebugInfo(); if (!DI) { CGF = nullptr; @@ -104,7 +102,7 @@ void ApplyDebugLocation::init(SourceLocation TemporaryLocation, return; if (TemporaryLocation.isValid()) { - DI->EmitLocation(CGF->Builder, TemporaryLocation, ImplicitCode); + DI->EmitLocation(CGF->Builder, TemporaryLocation); return; } @@ -3486,8 +3484,7 @@ void CGDebugInfo::EmitInlineFunctionEnd(CGBuilderTy &Builder) { setInlinedAt(llvm::DebugLoc(CurInlinedAt).getInlinedAt()); } -void CGDebugInfo::EmitLocation(CGBuilderTy &Builder, SourceLocation Loc, - bool ImplicitCode) { +void CGDebugInfo::EmitLocation(CGBuilderTy &Builder, SourceLocation Loc) { // Update our current location setLocation(Loc); @@ -3495,9 +3492,8 @@ void CGDebugInfo::EmitLocation(CGBuilderTy &Builder, SourceLocation Loc, return; llvm::MDNode *Scope = LexicalBlockStack.back(); - Builder.SetCurrentDebugLocation( - llvm::DebugLoc::get(getLineNumber(CurLoc), getColumnNumber(CurLoc), Scope, - CurInlinedAt, ImplicitCode)); + Builder.SetCurrentDebugLocation(llvm::DebugLoc::get( + getLineNumber(CurLoc), getColumnNumber(CurLoc), Scope, CurInlinedAt)); } void CGDebugInfo::CreateLexicalBlock(SourceLocation Loc) { @@ -3544,7 +3540,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, true /* ImplicitCode */); + EmitLocation(Builder, Loc); if (DebugKind <= codegenoptions::DebugLineTablesOnly) return; @@ -3560,7 +3556,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, true /* ImplicitCode */); + EmitLocation(Builder, CurLoc); LexicalBlockStack.pop_back(); } FnBeginRegionCount.pop_back(); diff --git a/clang/lib/CodeGen/CGDebugInfo.h b/clang/lib/CodeGen/CGDebugInfo.h index 6bffc74..8641c2d 100644 --- a/clang/lib/CodeGen/CGDebugInfo.h +++ b/clang/lib/CodeGen/CGDebugInfo.h @@ -377,9 +377,7 @@ 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. - /// \param ImplicitCode True if the Loc must have coverage information - void EmitLocation(CGBuilderTy &Builder, SourceLocation Loc, - bool ImplicitCode = false); + void EmitLocation(CGBuilderTy &Builder, SourceLocation Loc); /// Emit a call to llvm.dbg.function.start to indicate /// start of a new function. @@ -666,19 +664,16 @@ private: /// location or preferred location of the specified Expr. class ApplyDebugLocation { private: - void init(SourceLocation TemporaryLocation, bool DefaultToEmpty = false, - bool ImplicitCode = false); + void init(SourceLocation TemporaryLocation, bool DefaultToEmpty = false); ApplyDebugLocation(CodeGenFunction &CGF, bool DefaultToEmpty, - SourceLocation TemporaryLocation, - bool ImplicitCode = false); + SourceLocation TemporaryLocation); llvm::DebugLoc OriginalLocation; CodeGenFunction *CGF; public: /// Set the location to the (valid) TemporaryLocation. - ApplyDebugLocation(CodeGenFunction &CGF, SourceLocation TemporaryLocation, - bool ImplicitCode = false); + ApplyDebugLocation(CodeGenFunction &CGF, SourceLocation TemporaryLocation); ApplyDebugLocation(CodeGenFunction &CGF, const Expr *E); ApplyDebugLocation(CodeGenFunction &CGF, llvm::DebugLoc Loc); ApplyDebugLocation(ApplyDebugLocation &&Other) : CGF(Other.CGF) { @@ -701,15 +696,13 @@ 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, - bool ImplicitCode = false) { - return ApplyDebugLocation(CGF, false, TemporaryLocation, ImplicitCode); + SourceLocation TemporaryLocation) { + return ApplyDebugLocation(CGF, false, TemporaryLocation); } /// 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 787d25a..4ee8352 100644 --- a/clang/lib/CodeGen/CGException.cpp +++ b/clang/lib/CodeGen/CGException.cpp @@ -767,8 +767,7 @@ llvm::BasicBlock *CodeGenFunction::EmitLandingPad() { // Save the current IR generation state. CGBuilderTy::InsertPoint savedIP = Builder.saveAndClearIP(); - auto DL = ApplyDebugLocation::CreateDefaultArtificial( - *this, CurEHLocation, true /* ImplicitCode */); + auto DL = ApplyDebugLocation::CreateDefaultArtificial(*this, CurEHLocation); // 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 8fa0bad..77f978f 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, true /* ImplicitCode */); + DI->EmitLocation(Builder, EndLoc); } // 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, true /* ImplicitCode */); + DI->EmitLocation(Builder, EndLoc); 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, true /* ImplicitCode */); + DI->EmitLocation(Builder, StartLoc); // 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 7a5e308..6ea2d75 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(), true /* ImplicitCode */); + ApplyDebugLocation DL(CGF, Range.getEnd()); ForceCleanup(); } } diff --git a/clang/test/CodeGen/debug-info-scope-file.c b/clang/test/CodeGen/debug-info-scope-file.c index cc38449f..94123bb 100644 --- a/clang/test/CodeGen/debug-info-scope-file.c +++ b/clang/test/CodeGen/debug-info-scope-file.c @@ -5,11 +5,10 @@ // 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]], -// isImplicitCode: true) CHECK: [[F2:![0-9]*]] = distinct !DISubprogram(name: -// "f2",{{.*}} isDefinition: true CHECK: [[F2_LINE]] = !DILocation({{.*}}, -// scope: [[F2]], isImplicitCode: true) +// 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]]) void f1() { } diff --git a/clang/test/CodeGenCXX/debug-info-inheriting-constructor.cpp b/clang/test/CodeGenCXX/debug-info-inheriting-constructor.cpp index 728a193..8e47a0d 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]+}}, isImplicitCode: true) +// CHECK: ![[NOINL]] = !DILocation(line: [[@LINE+1]], scope: !{{[0-9]+}}) } diff --git a/clang/test/CodeGenCXX/linetable-virtual-variadic.cpp b/clang/test/CodeGenCXX/linetable-virtual-variadic.cpp index 154ee30..60dee5f 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]], isImplicitCode: true) +// CHECK: ![[LOC]] = !DILocation({{.*}}scope: ![[SP]]) // CHECK: ![[SP_I]] = distinct !DISubprogram(name: "VariadicFunction" -// CHECK: ![[LOC_I]] = !DILocation({{.*}}scope: ![[SP_I]], isImplicitCode: true) +// CHECK: ![[LOC_I]] = !DILocation({{.*}}scope: ![[SP_I]]) diff --git a/clang/test/CodeGenObjC/arc-linetable.m b/clang/test/CodeGenObjC/arc-linetable.m index 5e23d33..877dfdc 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]], isImplicitCode: true) + // CHECK: ![[RET1]] = !DILocation(line: [[@LINE+1]], scope: ![[TESTNOSIDEEFFECT]]) } // Cleanup + Ret - (int)testNoCleanup { diff --git a/clang/test/CodeGenObjC/debug-info-blocks.m b/clang/test/CodeGenObjC/debug-info-blocks.m index 4116662..b6e5b42 100644 --- a/clang/test/CodeGenObjC/debug-info-blocks.m +++ b/clang/test/CodeGenObjC/debug-info-blocks.m @@ -18,9 +18,11 @@ // 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; -- 2.7.4