From ed4eb86531cece1417e794ee4f9394dbb7243d4e Mon Sep 17 00:00:00 2001 From: Adrian Prantl Date: Fri, 16 Dec 2016 01:01:40 +0000 Subject: [PATCH] Revert "Update for LLVM global variable debug info API change." This reverts commit 289901 while investigating bot breakage. llvm-svn: 289908 --- clang/lib/CodeGen/CGDebugInfo.cpp | 42 +++++++++------------- clang/lib/CodeGen/CGDebugInfo.h | 6 ++-- clang/test/CodeGen/2009-10-20-GlobalDebug.c | 14 ++++---- clang/test/CodeGen/2010-08-10-DbgConstant.c | 2 +- clang/test/CodeGen/debug-info-atomic.c | 9 +++-- clang/test/CodeGen/debug-info-global-constant.c | 4 +-- clang/test/CodeGen/debug-info-static-const-fp.c | 30 ++++++---------- clang/test/CodeGen/debug-info-static.c | 3 +- clang/test/CodeGenCXX/debug-info-global.cpp | 5 ++- clang/test/CodeGenCXX/debug-info-static-member.cpp | 11 ++---- .../test/CodeGenCXX/debug-info-template-member.cpp | 5 ++- clang/test/CodeGenCXX/debug-info-template.cpp | 15 ++++---- clang/test/CodeGenCXX/debug-info.cpp | 5 ++- clang/test/CodeGenCXX/inline-dllexport-member.cpp | 3 +- 14 files changed, 61 insertions(+), 93 deletions(-) diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp index 3a47cb7..9b53152 100644 --- a/clang/lib/CodeGen/CGDebugInfo.cpp +++ b/clang/lib/CodeGen/CGDebugInfo.cpp @@ -2855,7 +2855,7 @@ CGDebugInfo::getGlobalVariableForwardDeclaration(const VarDecl *VD) { auto Align = getDeclAlignIfRequired(VD, CGM.getContext()); auto *GV = DBuilder.createTempGlobalVariableFwdDecl( DContext, Name, LinkageName, Unit, Line, getOrCreateType(T, Unit), - !VD->isExternallyVisible(), nullptr, Align); + !VD->isExternallyVisible(), nullptr, nullptr, Align); FwdDeclReplaceMap.emplace_back( std::piecewise_construct, std::make_tuple(cast(VD->getCanonicalDecl())), @@ -2873,12 +2873,8 @@ llvm::DINode *CGDebugInfo::getDeclarationOrDefinition(const Decl *D) { getOrCreateFile(TD->getLocation())); auto I = DeclCache.find(D->getCanonicalDecl()); - if (I != DeclCache.end()) { - auto N = I->second; - if (auto *GVE = dyn_cast_or_null(N)) - return GVE->getVariable(); - return dyn_cast_or_null(N); - } + if (I != DeclCache.end()) + return dyn_cast_or_null(I->second); // No definition for now. Emit a forward definition that might be // merged with a potential upcoming definition. @@ -3654,10 +3650,10 @@ CGDebugInfo::getOrCreateStaticDataMemberDeclarationOrNull(const VarDecl *D) { return CreateRecordStaticField(D, Ctxt, cast(DC)); } -llvm::DIGlobalVariableExpression *CGDebugInfo::CollectAnonRecordDecls( +llvm::DIGlobalVariable *CGDebugInfo::CollectAnonRecordDecls( const RecordDecl *RD, llvm::DIFile *Unit, unsigned LineNo, StringRef LinkageName, llvm::GlobalVariable *Var, llvm::DIScope *DContext) { - llvm::DIGlobalVariableExpression *GVE = nullptr; + llvm::DIGlobalVariable *GV = nullptr; for (const auto *Field : RD->fields()) { llvm::DIType *FieldTy = getOrCreateType(Field->getType(), Unit); @@ -3666,17 +3662,16 @@ llvm::DIGlobalVariableExpression *CGDebugInfo::CollectAnonRecordDecls( // Ignore unnamed fields, but recurse into anonymous records. if (FieldName.empty()) { if (const auto *RT = dyn_cast(Field->getType())) - GVE = CollectAnonRecordDecls(RT->getDecl(), Unit, LineNo, LinkageName, + GV = CollectAnonRecordDecls(RT->getDecl(), Unit, LineNo, LinkageName, Var, DContext); continue; } // Use VarDecl's Tag, Scope and Line number. - GVE = DBuilder.createGlobalVariableExpression( - DContext, FieldName, LinkageName, Unit, LineNo, FieldTy, - Var->hasLocalLinkage()); - Var->addDebugInfo(GVE); + GV = DBuilder.createGlobalVariable(DContext, FieldName, LinkageName, Unit, + LineNo, FieldTy, Var->hasLocalLinkage()); + Var->addDebugInfo(GV); } - return GVE; + return GV; } void CGDebugInfo::EmitGlobalVariable(llvm::GlobalVariable *Var, @@ -3689,8 +3684,7 @@ void CGDebugInfo::EmitGlobalVariable(llvm::GlobalVariable *Var, // it to the llvm::GlobalVariable. auto Cached = DeclCache.find(D->getCanonicalDecl()); if (Cached != DeclCache.end()) - return Var->addDebugInfo( - cast(Cached->second)); + return Var->addDebugInfo(cast(Cached->second)); // Create global variable debug descriptor. llvm::DIFile *Unit = nullptr; @@ -3702,7 +3696,7 @@ void CGDebugInfo::EmitGlobalVariable(llvm::GlobalVariable *Var, // Attempt to store one global variable for the declaration - even if we // emit a lot of fields. - llvm::DIGlobalVariableExpression *GVE = nullptr; + llvm::DIGlobalVariable *GV = nullptr; // If this is an anonymous union then we'll want to emit a global // variable for each member of the anonymous union so that it's possible @@ -3711,16 +3705,16 @@ void CGDebugInfo::EmitGlobalVariable(llvm::GlobalVariable *Var, const RecordDecl *RD = T->castAs()->getDecl(); assert(RD->isAnonymousStructOrUnion() && "unnamed non-anonymous struct or union?"); - GVE = CollectAnonRecordDecls(RD, Unit, LineNo, LinkageName, Var, DContext); + GV = CollectAnonRecordDecls(RD, Unit, LineNo, LinkageName, Var, DContext); } else { auto Align = getDeclAlignIfRequired(D, CGM.getContext()); - GVE = DBuilder.createGlobalVariableExpression( + GV = DBuilder.createGlobalVariable( DContext, DeclName, LinkageName, Unit, LineNo, getOrCreateType(T, Unit), Var->hasLocalLinkage(), /*Expr=*/nullptr, getOrCreateStaticDataMemberDeclarationOrNull(D), Align); - Var->addDebugInfo(GVE); + Var->addDebugInfo(GV); } - DeclCache[D->getCanonicalDecl()].reset(GVE); + DeclCache[D->getCanonicalDecl()].reset(GV); } void CGDebugInfo::EmitGlobalVariable(const ValueDecl *VD, const APValue &Init) { @@ -3771,7 +3765,7 @@ void CGDebugInfo::EmitGlobalVariable(const ValueDecl *VD, const APValue &Init) { else if (Init.isFloat() && CGM.getContext().getTypeSize(VD->getType()) <= 64) InitExpr = DBuilder.createConstantValueExpression( Init.getFloat().bitcastToAPInt().getZExtValue()); - GV.reset(DBuilder.createGlobalVariableExpression( + GV.reset(DBuilder.createGlobalVariable( DContext, Name, StringRef(), Unit, getLineNumber(VD->getLocation()), Ty, true, InitExpr, getOrCreateStaticDataMemberDeclarationOrNull(VarD), Align)); @@ -3918,8 +3912,6 @@ void CGDebugInfo::finalize() { else Repl = it->second; - if (auto *GVE = dyn_cast_or_null(Repl)) - Repl = GVE->getVariable(); DBuilder.replaceTemporary(std::move(FwdDecl), cast(Repl)); } diff --git a/clang/lib/CodeGen/CGDebugInfo.h b/clang/lib/CodeGen/CGDebugInfo.h index 70e3d48..4cf7bb3 100644 --- a/clang/lib/CodeGen/CGDebugInfo.h +++ b/clang/lib/CodeGen/CGDebugInfo.h @@ -496,14 +496,14 @@ private: llvm::DIGlobalVariable * getGlobalVariableForwardDeclaration(const VarDecl *VD); - /// Return a global variable that represents one of the collection of global - /// variables created for an anonmyous union. + /// \brief Return a global variable that represents one of the + /// collection of global variables created for an anonmyous union. /// /// Recursively collect all of the member fields of a global /// anonymous decl and create static variables for them. The first /// time this is called it needs to be on a union and then from /// there we can have additional unnamed fields. - llvm::DIGlobalVariableExpression * + llvm::DIGlobalVariable * CollectAnonRecordDecls(const RecordDecl *RD, llvm::DIFile *Unit, unsigned LineNo, StringRef LinkageName, llvm::GlobalVariable *Var, llvm::DIScope *DContext); diff --git a/clang/test/CodeGen/2009-10-20-GlobalDebug.c b/clang/test/CodeGen/2009-10-20-GlobalDebug.c index 0d7c759..38f20cd 100644 --- a/clang/test/CodeGen/2009-10-20-GlobalDebug.c +++ b/clang/test/CodeGen/2009-10-20-GlobalDebug.c @@ -10,11 +10,9 @@ int main() { return 0; } -// CHECK: [[L]] = !DIGlobalVariableExpression(var: [[LV:.*]]) -// CHECK: [[LV]] = distinct !DIGlobalVariable(name: "localstatic" -// CHECK-NOT: linkageName: -// CHECK-SAME: line: 9, -// CHECK: [[G]] = !DIGlobalVariableExpression(var: [[GV:.*]]) -// CHECK: [[GV]] = distinct !DIGlobalVariable(name: "global" -// CHECK-NOT: linkageName: -// CHECK-SAME: line: 7, +// CHECK: [[L]] = distinct !DIGlobalVariable(name: "localstatic" +// CHECK-NOT: linkageName: +// CHECK-SAME: line: 9, +// CHECK: [[G]] = distinct !DIGlobalVariable(name: "global" +// CHECK-NOT: linkageName: +// CHECK-SAME: line: 7, diff --git a/clang/test/CodeGen/2010-08-10-DbgConstant.c b/clang/test/CodeGen/2010-08-10-DbgConstant.c index 68947ed..3a40c24 100644 --- a/clang/test/CodeGen/2010-08-10-DbgConstant.c +++ b/clang/test/CodeGen/2010-08-10-DbgConstant.c @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -S -emit-llvm -debug-info-kind=limited %s -o - | FileCheck %s -// CHECK: !DIGlobalVariableExpression(var: [[VAR:.*]], expr: [[EXPR:![0-9]+]]) +// CHECK: !DIGlobalVariable({{.*}}, expr: [[EXPR:![0-9]+]]) // CHECK: [[EXPR]] = !DIExpression(DW_OP_constu, 201, DW_OP_stack_value) static const unsigned int ro = 201; diff --git a/clang/test/CodeGen/debug-info-atomic.c b/clang/test/CodeGen/debug-info-atomic.c index 3de0d35..06b9546 100644 --- a/clang/test/CodeGen/debug-info-atomic.c +++ b/clang/test/CodeGen/debug-info-atomic.c @@ -1,8 +1,7 @@ // RUN: %clang -g -c -std=c11 -S -emit-llvm -o - %s | FileCheck %s -// CHECK: !DIGlobalVariable(name: "i" -// CHECK-SAME: type: ![[T:.*]], isLocal: false, isDefinition: true) -// CHECK: ![[T]] = !DIDerivedType(tag: DW_TAG_const_type, baseType: ![[BT:.*]]) -// CHECK: ![[BT]] = !DIDerivedType(tag: DW_TAG_atomic_type, baseType: ![[BTT:.*]]) -// CHECK: ![[BTT]] = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed) +// CHECK: !DIGlobalVariable(name: "i"{{.*}}type: !5, isLocal: false, isDefinition: true) +// CHECK: !5 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !6) +// CHECK: !6 = !DIDerivedType(tag: DW_TAG_atomic_type, baseType: !7) +// CHECK: !7 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed) _Atomic const int i; diff --git a/clang/test/CodeGen/debug-info-global-constant.c b/clang/test/CodeGen/debug-info-global-constant.c index 4175f24..f214fdc 100644 --- a/clang/test/CodeGen/debug-info-global-constant.c +++ b/clang/test/CodeGen/debug-info-global-constant.c @@ -5,8 +5,8 @@ // exactly once. // CHECK: @i = internal constant i32 1, align 4, !dbg ![[I:[0-9]+]] -// CHECK: ![[I]] = !DIGlobalVariableExpression(var: ![[VAR:.*]], expr: ![[EXPR:[0-9]+]]) -// CHECK: ![[VAR]] = distinct !DIGlobalVariable(name: "i", +// CHECK: ![[I]] = distinct !DIGlobalVariable(name: "i", +// CHECK-SAME: expr: ![[EXPR:[0-9]+]] // CHECK: !DICompileUnit({{.*}}globals: ![[GLOBALS:[0-9]+]]) // CHECK: ![[GLOBALS]] = !{![[I]]} // CHECK: ![[EXPR]] = !DIExpression(DW_OP_constu, 1, DW_OP_stack_value) diff --git a/clang/test/CodeGen/debug-info-static-const-fp.c b/clang/test/CodeGen/debug-info-static-const-fp.c index 4dfe057..67cda82 100644 --- a/clang/test/CodeGen/debug-info-static-const-fp.c +++ b/clang/test/CodeGen/debug-info-static-const-fp.c @@ -33,22 +33,14 @@ int main() { return hVal + fVal + dVal + ldVal; } -// CHECK: !DIGlobalVariableExpression(var: [[HVAL:.*]], expr: [[HEXPR:.*]]) -// CHECK: [[HVAL]] = distinct !DIGlobalVariable(name: "hVal", -// CHECK-SAME: isLocal: true, isDefinition: true -// CHECK: [[HEXPR]] = !DIExpression(DW_OP_constu, 16502, DW_OP_stack_value) - -// CHECK: !DIGlobalVariableExpression(var: [[FVAL:.*]], expr: [[FEXPR:.*]]) -// CHECK: [[FVAL]] = distinct !DIGlobalVariable(name: "fVal", -// CHECK-SAME: isLocal: true, isDefinition: true -// CHECK: [[FEXPR]] = !DIExpression(DW_OP_constu, 3238681178, DW_OP_stack_value) - -// CHECK: !DIGlobalVariableExpression(var: [[DVAL:.*]], expr: [[DEXPR:.*]]) -// CHECK: [[DVAL]] = distinct !DIGlobalVariable(name: "dVal", -// CHECK-SAME: isLocal: true, isDefinition: true -// CHECK: [[DEXPR]] = !DIExpression(DW_OP_constu, 4658387303597904457, DW_OP_stack_value) - -// CHECK-LDlg-DAG: [[LDVAL:.*]] = distinct !DIGlobalVariable(name: "ldVal", {{.*}}, isLocal: true, isDefinition: true) -// CHECK-LDlg-DAG: !DIGlobalVariableExpression(var: [[LDVAL]]) -// CHECK-LDsm-DAG: [[LDVAL:.*]] = distinct !DIGlobalVariable(name: "ldVal", {{.*}}, isLocal: true, isDefinition: true) -// CHECK-LDsm-DAG: !DIGlobalVariableExpression(var: [[LDVAL]], expr: +// CHECK: !DIGlobalVariable(name: "hVal", {{.*}}, isLocal: true, isDefinition: true, expr: ![[HEXPR:[0-9]+]] +// CHECK: ![[HEXPR]] = !DIExpression(DW_OP_constu, 16502, DW_OP_stack_value) + +// CHECK: !DIGlobalVariable(name: "fVal", {{.*}}, isLocal: true, isDefinition: true, expr: ![[FEXPR:[0-9]+]] +// CHECK: ![[FEXPR]] = !DIExpression(DW_OP_constu, 3238681178, DW_OP_stack_value) + +// CHECK: !DIGlobalVariable(name: "dVal", {{.*}}, isLocal: true, isDefinition: true, expr: ![[DEXPR:[0-9]+]] +// CHECK: ![[DEXPR]] = !DIExpression(DW_OP_constu, 4658387303597904457, DW_OP_stack_value) + +// CHECK-LDlg: !DIGlobalVariable(name: "ldVal", {{.*}}, isLocal: true, isDefinition: true) +// CHECK-LDsm: !DIGlobalVariable(name: "ldVal", {{.*}}, isLocal: true, isDefinition: true, expr: diff --git a/clang/test/CodeGen/debug-info-static.c b/clang/test/CodeGen/debug-info-static.c index 016f1e6..0ebd6a6 100644 --- a/clang/test/CodeGen/debug-info-static.c +++ b/clang/test/CodeGen/debug-info-static.c @@ -2,8 +2,7 @@ // CHECK: @f.xyzzy = internal global i32 0, align 4, !dbg [[XYZZY:![0-9]+]] -// CHECK: [[XYZZY]] = !DIGlobalVariableExpression(var: [[VAR:.*]]) -// CHECK: [[VAR]] = distinct !DIGlobalVariable +// CHECK: [[XYZZY]] = distinct !DIGlobalVariable void f(void) { static int xyzzy; diff --git a/clang/test/CodeGenCXX/debug-info-global.cpp b/clang/test/CodeGenCXX/debug-info-global.cpp index 5abc050..7956023 100644 --- a/clang/test/CodeGenCXX/debug-info-global.cpp +++ b/clang/test/CodeGenCXX/debug-info-global.cpp @@ -15,8 +15,7 @@ int f1() { // CHECK: [[GLOBALS]] = !{[[CNST:![0-9]*]]} -// CHECK: [[CNST]] = !DIGlobalVariableExpression(var: [[CNSTV:.*]], expr: -// CHECK: [[CNSTV]] = distinct !DIGlobalVariable(name: "cnst", -// CHECK-SAME: scope: [[NS:![0-9]*]] +// CHECK: [[CNST]] = distinct !DIGlobalVariable(name: "cnst", +// CHECK-SAME: scope: [[NS:![0-9]*]] // CHECK: [[NS]] = !DINamespace(name: "ns" diff --git a/clang/test/CodeGenCXX/debug-info-static-member.cpp b/clang/test/CodeGenCXX/debug-info-static-member.cpp index c777ccb..d28c2ac 100644 --- a/clang/test/CodeGenCXX/debug-info-static-member.cpp +++ b/clang/test/CodeGenCXX/debug-info-static-member.cpp @@ -32,9 +32,7 @@ public: // why the definition of "a" comes before the declarations while // "b" and "c" come after. -// CHECK: [[A]] = !DIGlobalVariableExpression(var: [[AV:.*]]) -// CHECK: [[AV]] = distinct !DIGlobalVariable(name: "a", -// CHECK-SAME: declaration: ![[DECL_A:[0-9]+]]) +// CHECK: [[A]] = distinct !DIGlobalVariable(name: "a", {{.*}} declaration: ![[DECL_A:[0-9]+]]) // // CHECK: !DICompositeType(tag: DW_TAG_enumeration_type, name: "X"{{.*}}, identifier: "_ZTS1X") // CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "anon_static_decl_struct" @@ -45,9 +43,7 @@ public: // CHECK: !DIDerivedType(tag: DW_TAG_member, name: "static_decl_templ_var" int C::a = 4; -// CHECK: [[B]] = !DIGlobalVariableExpression(var: [[BV:.*]]) -// CHECK: [[BV]] = distinct !DIGlobalVariable(name: "b", -// CHECK-SAME: declaration: ![[DECL_B:[0-9]+]]) +// CHECK: [[B]] = distinct !DIGlobalVariable(name: "b", {{.*}} declaration: ![[DECL_B:[0-9]+]]) // CHECK: ![[DECL_B]] = !DIDerivedType(tag: DW_TAG_member, name: "b" // CHECK-NOT: size: // CHECK-NOT: align: @@ -93,8 +89,7 @@ int C::a = 4; // CHECK-SAME: flags: DIFlagPublic | DIFlagStaticMember) int C::b = 2; -// CHECK: [[C]] = !DIGlobalVariableExpression(var: [[CV:.*]]) -// CHECK: [[CV]] = distinct !DIGlobalVariable(name: "c", {{.*}} declaration: ![[DECL_C]]) +// CHECK: [[C]] = distinct !DIGlobalVariable(name: "c", {{.*}} declaration: ![[DECL_C]]) int C::c = 1; int main() diff --git a/clang/test/CodeGenCXX/debug-info-template-member.cpp b/clang/test/CodeGenCXX/debug-info-template-member.cpp index 2b84074..749b92e 100644 --- a/clang/test/CodeGenCXX/debug-info-template-member.cpp +++ b/clang/test/CodeGenCXX/debug-info-template-member.cpp @@ -19,9 +19,8 @@ inline int add3(int x) { } // The compile unit pulls in the global variables first. -// CHECK: [[X]] = !DIGlobalVariableExpression(var: [[XV:.*]]) -// CHECK: [[XV]] = distinct !DIGlobalVariable(name: "x", -// CHECK-SAME: type: ![[OUTER_FOO_INNER_ID:[0-9]+]] +// CHECK: [[X]] = distinct !DIGlobalVariable(name: "x", +// CHECK-SAME: type: ![[OUTER_FOO_INNER_ID:[0-9]+]] // CHECK: ![[OUTER_FOO_INNER_ID:[0-9]*]] = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "inner"{{.*}}, identifier: // CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "foo" diff --git a/clang/test/CodeGenCXX/debug-info-template.cpp b/clang/test/CodeGenCXX/debug-info-template.cpp index 54fac0b..d4a7112 100644 --- a/clang/test/CodeGenCXX/debug-info-template.cpp +++ b/clang/test/CodeGenCXX/debug-info-template.cpp @@ -25,9 +25,8 @@ struct TC { int glb; void func(); -// CHECK: [[TCI]] = !DIGlobalVariableExpression(var: [[TCIV:.*]]) -// CHECK: [[TCIV]] = distinct !DIGlobalVariable(name: "tci", -// CHECK-SAME: type: ![[TCNESTED:[0-9]+]] +// CHECK: [[TCI]] = distinct !DIGlobalVariable(name: "tci", +// CHECK-SAME: type: ![[TCNESTED:[0-9]+]] // CHECK: ![[TCNESTED]] ={{.*}}!DICompositeType(tag: DW_TAG_structure_type, name: "nested", // CHECK-SAME: scope: ![[TC:[0-9]+]], @@ -84,9 +83,8 @@ TC // CHECK: [[TCARG7_3]] = !DITemplateValueParameter(type: [[INT]], value: i32 3) 3>::nested tci; -// CHECK: [[TCN]] = !DIGlobalVariableExpression(var: [[TCNV:.*]]) -// CHECK: [[TCNV]] = distinct !DIGlobalVariable(name: "tcn" -// CHECK-SAME: type: ![[TCNT:[0-9]+]] +// CHECK: [[TCN]] = distinct !DIGlobalVariable(name: "tcn" +// CHECK-SAME: type: ![[TCNT:[0-9]+]] TC // CHECK: ![[TCNT]] ={{.*}}!DICompositeType(tag: DW_TAG_structure_type, name: "TC" // CHECK-SAME: templateParams: [[TCNARGS:![0-9]*]] @@ -125,9 +123,8 @@ template