From: David Blaikie Date: Wed, 1 Jul 2015 18:07:22 +0000 (+0000) Subject: Revert "[DebugInfo] Fix debug info generation for function static variables, typedefs... X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ef109b2e2744192d5c4c1013ea4a7883499d0c44;p=clang Revert "[DebugInfo] Fix debug info generation for function static variables, typedefs, and records" Caused PR24008. This reverts commit r241154. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@241177 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/CodeGen/CGDebugInfo.cpp b/lib/CodeGen/CGDebugInfo.cpp index 7368dc69f5..8c4b4b3d06 100644 --- a/lib/CodeGen/CGDebugInfo.cpp +++ b/lib/CodeGen/CGDebugInfo.cpp @@ -786,18 +786,15 @@ llvm::DIType *CGDebugInfo::CreateType(const TemplateSpecializationType *Ty, llvm::DIType *CGDebugInfo::CreateType(const TypedefType *Ty, llvm::DIFile *Unit) { - TypedefNameDecl *TD = Ty->getDecl(); // We don't set size information, but do specify where the typedef was // declared. - SourceLocation Loc = TD->getLocation(); - - llvm::DIScope *TDContext = getDeclarationLexicalScope(*TD, QualType(Ty, 0)); + SourceLocation Loc = Ty->getDecl()->getLocation(); // Typedefs are derived from some other type. return DBuilder.createTypedef( getOrCreateType(Ty->getDecl()->getUnderlyingType(), Unit), Ty->getDecl()->getName(), getOrCreateFile(Loc), getLineNumber(Loc), - TDContext); + getContextDescriptor(cast(Ty->getDecl()->getDeclContext()))); } llvm::DIType *CGDebugInfo::CreateType(const FunctionType *Ty, @@ -1445,23 +1442,6 @@ llvm::DIType *CGDebugInfo::getOrCreateInterfaceType(QualType D, return T; } -void CGDebugInfo::recordDeclarationLexicalScope(const Decl &D) { - assert(LexicalBlockMap.find(&D) == LexicalBlockMap.end() && - "D is already mapped to lexical block scope"); - if (!LexicalBlockStack.empty()) - LexicalBlockMap[&D] = LexicalBlockStack.back(); -} - -llvm::DIScope *CGDebugInfo::getDeclarationLexicalScope(const Decl &D, - QualType Ty) { - auto I = LexicalBlockMap.find(&D); - if (I != LexicalBlockMap.end()) { - RetainedTypes.push_back(Ty.getAsOpaquePtr()); - return I->second; - } else - return getContextDescriptor(cast(D.getDeclContext())); -} - void CGDebugInfo::completeType(const EnumDecl *ED) { if (DebugKind <= CodeGenOptions::DebugLineTablesOnly) return; @@ -2289,7 +2269,8 @@ llvm::DICompositeType *CGDebugInfo::CreateLimitedType(const RecordType *Ty) { unsigned Line = getLineNumber(RD->getLocation()); StringRef RDName = getClassName(RD); - llvm::DIScope *RDContext = getDeclarationLexicalScope(*RD, QualType(Ty, 0)); + llvm::DIScope *RDContext = + getContextDescriptor(cast(RD->getDeclContext())); // If we ended up creating the type during the context chain construction, // just return that. @@ -2435,14 +2416,7 @@ void CGDebugInfo::collectVarDeclProps(const VarDecl *VD, llvm::DIFile *&Unit, // outside the class by putting it in the global scope. if (DC->isRecord()) DC = CGM.getContext().getTranslationUnitDecl(); - - if (VD->isStaticLocal()) { - // Get context for static locals (that are technically globals) the same way - // we do for "local" locals -- by using current lexical block. - assert(!LexicalBlockStack.empty() && "Region stack mismatch, stack empty!"); - VDContext = LexicalBlockStack.back(); - } else - VDContext = getContextDescriptor(dyn_cast(DC)); + VDContext = getContextDescriptor(dyn_cast(DC)); } llvm::DISubprogram * diff --git a/lib/CodeGen/CGDebugInfo.h b/lib/CodeGen/CGDebugInfo.h index a4e51e99df..10d3b0d9ab 100644 --- a/lib/CodeGen/CGDebugInfo.h +++ b/lib/CodeGen/CGDebugInfo.h @@ -100,11 +100,6 @@ class CGDebugInfo { // LexicalBlockStack - Keep track of our current nested lexical block. std::vector> LexicalBlockStack; - - /// \brief Map of AST declaration to its lexical block scope. - llvm::DenseMap> - LexicalBlockMap; - llvm::DenseMap RegionMap; // FnBeginRegionCount - Keep track of LexicalBlockStack counter at the // beginning of a function. This is used to pop unbalanced regions at @@ -310,12 +305,6 @@ public: /// debug info. llvm::DIType *getOrCreateInterfaceType(QualType Ty, SourceLocation Loc); - /// \brief Map AST declaration to its lexical block scope if available. - void recordDeclarationLexicalScope(const Decl &D); - - /// \brief Get lexical scope of AST declaration. - llvm::DIScope *getDeclarationLexicalScope(const Decl &D, QualType Ty); - void completeType(const EnumDecl *ED); void completeType(const RecordDecl *RD); void completeRequiredType(const RecordDecl *RD); diff --git a/lib/CodeGen/CGDecl.cpp b/lib/CodeGen/CGDecl.cpp index 7550266e7b..07dbce4252 100644 --- a/lib/CodeGen/CGDecl.cpp +++ b/lib/CodeGen/CGDecl.cpp @@ -81,8 +81,10 @@ void CodeGenFunction::EmitDecl(const Decl &D) { case Decl::UsingShadow: llvm_unreachable("Declaration should not be in declstmts!"); case Decl::Function: // void X(); + case Decl::Record: // struct/union/class X; case Decl::Enum: // enum X; case Decl::EnumConstant: // enum ? { X = ? } + case Decl::CXXRecord: // struct/union/class X; [C++] case Decl::StaticAssert: // static_assert(X, ""); [C++0x] case Decl::Label: // __label__ x; case Decl::Import: @@ -91,12 +93,6 @@ void CodeGenFunction::EmitDecl(const Decl &D) { // None of these decls require codegen support. return; - case Decl::CXXRecord: // struct/union/class X; [C++] - case Decl::Record: // struct/union/class X; - if (CGDebugInfo *DI = getDebugInfo()) - DI->recordDeclarationLexicalScope(D); - return; - case Decl::NamespaceAlias: if (CGDebugInfo *DI = getDebugInfo()) DI->EmitNamespaceAlias(cast(D)); @@ -121,9 +117,6 @@ void CodeGenFunction::EmitDecl(const Decl &D) { const TypedefNameDecl &TD = cast(D); QualType Ty = TD.getUnderlyingType(); - if (CGDebugInfo *DI = getDebugInfo()) - DI->recordDeclarationLexicalScope(D); - if (Ty->isVariablyModifiedType()) EmitVariablyModifiedType(Ty); } diff --git a/test/CodeGenCXX/debug-info-lb-class.cpp b/test/CodeGenCXX/debug-info-lb-class.cpp deleted file mode 100644 index 559a7b44ae..0000000000 --- a/test/CodeGenCXX/debug-info-lb-class.cpp +++ /dev/null @@ -1,21 +0,0 @@ -// RUN: %clang_cc1 -triple x86_64-none-linux-gnu -emit-llvm -g %s -o - | FileCheck %s - -int foo(int x) { - if(x) - { - class X { - public: - char z; - X(int y) : z(y) {} - }; - { - X a(x); - return a.z; - } - } - return 0; -} - -// CHECK: !{{[0-9]+}} = !DICompositeType(tag: DW_TAG_class_type, name: "X", scope: [[LBScope:![0-9]+]], -// CHECK: [[LBScope]] = distinct !DILexicalBlock(scope: !{{[0-9]+}}, file: !{{[0-9]+}}, line: 5) - diff --git a/test/CodeGenCXX/debug-info-lb-static.cpp b/test/CodeGenCXX/debug-info-lb-static.cpp deleted file mode 100644 index 02be29639f..0000000000 --- a/test/CodeGenCXX/debug-info-lb-static.cpp +++ /dev/null @@ -1,17 +0,0 @@ -// RUN: %clang_cc1 -triple x86_64-none-linux-gnu -emit-llvm -g %s -o - | FileCheck %s - -int foo(int x) { - if(x) - { - static int bar = 0; - { - int a = bar++; - return a; - } - } - return 0; -} - -// CHECK: !{{[0-9]+}} = !DIGlobalVariable(name: "bar", scope: [[LBScope:![0-9]+]], -// CHECK: [[LBScope]] = distinct !DILexicalBlock(scope: !{{[0-9]+}}, file: !{{[0-9]+}}, line: 5) - diff --git a/test/CodeGenCXX/debug-info-lb-static2.cpp b/test/CodeGenCXX/debug-info-lb-static2.cpp deleted file mode 100644 index df35f8f391..0000000000 --- a/test/CodeGenCXX/debug-info-lb-static2.cpp +++ /dev/null @@ -1,16 +0,0 @@ -// RUN: %clang_cc1 -triple x86_64-none-linux-gnu -emit-llvm -g %s -o - | FileCheck %s - -int main() { - static int X = 10; - { - static bool X = false; - return (int) X; - } - return X; -} - -// CHECK: [[FuncScope:![0-9]+]] = !DISubprogram(name: "main", -// CHECK: !{{[0-9]+}} = !DIGlobalVariable(name: "X", scope: [[FuncScope:![0-9]+]], -// CHECK: !{{[0-9]+}} = !DIGlobalVariable(name: "X", scope: [[LBScope:![0-9]+]], -// CHECK: [[LBScope]] = distinct !DILexicalBlock(scope: !{{[0-9]+}}, file: !{{[0-9]+}}, line: 5) - diff --git a/test/CodeGenCXX/debug-info-lb-typedef.cpp b/test/CodeGenCXX/debug-info-lb-typedef.cpp deleted file mode 100644 index 0bc2585465..0000000000 --- a/test/CodeGenCXX/debug-info-lb-typedef.cpp +++ /dev/null @@ -1,17 +0,0 @@ -// RUN: %clang_cc1 -triple x86_64-none-linux-gnu -emit-llvm -g %s -o - | FileCheck %s - -int foo(int x) { - if(x) - { - typedef char X; - { - X a = x; - return a; - } - } - return 0; -} - -// CHECK: !{{[0-9]+}} = !DIDerivedType(tag: DW_TAG_typedef, name: "X", scope: [[LBScope:![0-9]+]], -// CHECK: [[LBScope]] = distinct !DILexicalBlock(scope: !{{[0-9]+}}, file: !{{[0-9]+}}, line: 5) -