Author: hans
Date: Tue Feb 23 13:10:16 2016
New Revision: 261670
URL: http://llvm.org/viewvc/llvm-project?rev=261670&view=rev
Log:
Revert r261634 "Supporting all entities declared in lexical scope in LLVM debug
info." and r261657
r261634 and r261633 seems to have caused PR26715. r261657 depends on the former
two.
Removed:
cfe/trunk/test/CodeGenCXX/debug-info-lb.cpp
Modified:
cfe/trunk/lib/CodeGen/CGDebugInfo.cpp
cfe/trunk/lib/CodeGen/CGDebugInfo.h
cfe/trunk/lib/CodeGen/CGDecl.cpp
cfe/trunk/test/CodeGenCXX/debug-info-anon-union-vars.cpp
Modified: cfe/trunk/lib/CodeGen/CGDebugInfo.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDebugInfo.cpp?rev=261670&r1=261669&r2=261670&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGDebugInfo.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGDebugInfo.cpp Tue Feb 23 13:10:16 2016
@@ -831,18 +831,15 @@ llvm::DIType *CGDebugInfo::CreateType(co
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);
+ getDeclContextDescriptor(Ty->getDecl()));
}
llvm::DIType *CGDebugInfo::CreateType(const FunctionType *Ty,
@@ -1475,23 +1472,6 @@ llvm::DIType *CGDebugInfo::getOrCreateSt
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;
- }
- return getDeclContextDescriptor(cast<Decl>(&D));
-}
-
void CGDebugInfo::completeType(const EnumDecl *ED) {
if (DebugKind <= codegenoptions::DebugLineTablesOnly)
return;
@@ -2071,22 +2051,24 @@ llvm::DIType *CGDebugInfo::CreateEnumTyp
// If this is just a forward declaration, construct an appropriately
// marked node and just return it.
if (isImportedFromModule || !ED->getDefinition()) {
- // Note that it is possible for enums to be created as part of
- // their own declcontext. In this case a FwdDecl will be created
- // twice. This doesn't cause a problem because both FwdDecls are
- // entered into the ReplaceMap: finalize() will replace the first
- // FwdDecl with the second and then replace the second with
- // complete type.
- llvm::DIScope *EDContext = getDeclContextDescriptor(ED);
llvm::DIFile *DefUnit = getOrCreateFile(ED->getLocation());
+
+ // It is possible for enums to be created as part of their own
+ // declcontext. We need to cache a placeholder to avoid the type being
+ // created twice before hitting the cache.
llvm::TempDIScope TmpContext(DBuilder.createReplaceableCompositeType(
llvm::dwarf::DW_TAG_enumeration_type, "", TheCU, DefUnit, 0));
unsigned Line = getLineNumber(ED->getLocation());
StringRef EDName = ED->getName();
llvm::DIType *RetTy = DBuilder.createReplaceableCompositeType(
- llvm::dwarf::DW_TAG_enumeration_type, EDName, EDContext, DefUnit, Line,
- 0, Size, Align, llvm::DINode::FlagFwdDecl, FullName);
+ llvm::dwarf::DW_TAG_enumeration_type, EDName, TmpContext.get(),
DefUnit,
+ Line, 0, Size, Align, llvm::DINode::FlagFwdDecl, FullName);
+
+ // Cache the enum type so it is available when building the declcontext
+ // and replace the declcontect with the real thing.
+ TypeCache[Ty].reset(RetTy);
+ TmpContext->replaceAllUsesWith(getDeclContextDescriptor(ED));
ReplaceMap.emplace_back(
std::piecewise_construct, std::make_tuple(Ty),
@@ -2121,7 +2103,7 @@ llvm::DIType *CGDebugInfo::CreateTypeDef
llvm::DIFile *DefUnit = getOrCreateFile(ED->getLocation());
unsigned Line = getLineNumber(ED->getLocation());
- llvm::DIScope *EnumContext = getDeclarationLexicalScope(*ED, QualType(Ty,
0));
+ llvm::DIScope *EnumContext = getDeclContextDescriptor(ED);
llvm::DIType *ClassTy =
ED->isFixed() ? getOrCreateType(ED->getIntegerType(), DefUnit) : nullptr;
return DBuilder.createEnumerationType(EnumContext, ED->getName(), DefUnit,
@@ -2382,7 +2364,7 @@ llvm::DICompositeType *CGDebugInfo::Crea
unsigned Line = getLineNumber(RD->getLocation());
StringRef RDName = getClassName(RD);
- llvm::DIScope *RDContext = getDeclarationLexicalScope(*RD, QualType(Ty, 0));
+ llvm::DIScope *RDContext = getDeclContextDescriptor(RD);
// If we ended up creating the type during the context chain construction,
// just return that.
@@ -2529,15 +2511,8 @@ void CGDebugInfo::collectVarDeclProps(co
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 {
- llvm::DIScope *Mod = getParentModuleOrNull(VD);
- VDContext = getContextDescriptor(cast<Decl>(DC), Mod ? Mod : TheCU);
- }
+ llvm::DIScope *Mod = getParentModuleOrNull(VD);
+ VDContext = getContextDescriptor(cast<Decl>(DC), Mod ? Mod : TheCU);
}
llvm::DISubprogram *
Modified: cfe/trunk/lib/CodeGen/CGDebugInfo.h
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDebugInfo.h?rev=261670&r1=261669&r2=261670&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGDebugInfo.h (original)
+++ cfe/trunk/lib/CodeGen/CGDebugInfo.h Tue Feb 23 13:10:16 2016
@@ -116,11 +116,6 @@ class CGDebugInfo {
/// Keep track of our current nested lexical block.
std::vector<llvm::TypedTrackingMDRef<llvm::DIScope>> LexicalBlockStack;
-
- /// Map of AST declaration to its lexical block scope.
- llvm::DenseMap<const Decl *, llvm::TypedTrackingMDRef<llvm::DIScope>>
- LexicalBlockMap;
-
llvm::DenseMap<const Decl *, llvm::TrackingMDRef> RegionMap;
/// Keep track of LexicalBlockStack counter at the beginning of a
/// function. This is used to pop unbalanced regions at the end of a
@@ -383,12 +378,6 @@ public:
/// Emit an Objective-C interface type standalone debug info.
llvm::DIType *getOrCreateInterfaceType(QualType Ty, SourceLocation Loc);
- /// Map AST declaration to its lexical block scope if available.
- void recordDeclarationLexicalScope(const Decl &D);
-
- /// Get lexical scope of AST declaration.
- llvm::DIScope *getDeclarationLexicalScope(const Decl &D, QualType Ty);
-
/// Emit standalone debug info for a type.
llvm::DIType *getOrCreateStandaloneType(QualType Ty, SourceLocation Loc);
Modified: cfe/trunk/lib/CodeGen/CGDecl.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDecl.cpp?rev=261670&r1=261669&r2=261670&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGDecl.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGDecl.cpp Tue Feb 23 13:10:16 2016
@@ -83,7 +83,11 @@ void CodeGenFunction::EmitDecl(const Dec
case Decl::UsingShadow:
case Decl::ObjCTypeParam:
llvm_unreachable("Declaration should not be in declstmts!");
- case Decl::Function: // void X();
+ 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:
@@ -93,21 +97,13 @@ void CodeGenFunction::EmitDecl(const Dec
// None of these decls require codegen support.
return;
- 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++]
- if (CGDebugInfo *DI = getDebugInfo())
- DI->recordDeclarationLexicalScope(D);
- return;
-
case Decl::NamespaceAlias:
if (CGDebugInfo *DI = getDebugInfo())
- DI->EmitNamespaceAlias(cast<NamespaceAliasDecl>(D));
+ DI->EmitNamespaceAlias(cast<NamespaceAliasDecl>(D));
return;
case Decl::Using: // using X; [C++]
if (CGDebugInfo *DI = getDebugInfo())
- DI->EmitUsingDecl(cast<UsingDecl>(D));
+ DI->EmitUsingDecl(cast<UsingDecl>(D));
return;
case Decl::UsingDirective: // using namespace X; [C++]
if (CGDebugInfo *DI = getDebugInfo())
@@ -125,9 +121,6 @@ void CodeGenFunction::EmitDecl(const Dec
const TypedefNameDecl &TD = cast<TypedefNameDecl>(D);
QualType Ty = TD.getUnderlyingType();
- if (CGDebugInfo *DI = getDebugInfo())
- DI->recordDeclarationLexicalScope(D);
-
if (Ty->isVariablyModifiedType())
EmitVariablyModifiedType(Ty);
}
Modified: cfe/trunk/test/CodeGenCXX/debug-info-anon-union-vars.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/debug-info-anon-union-vars.cpp?rev=261670&r1=261669&r2=261670&view=diff
==============================================================================
--- cfe/trunk/test/CodeGenCXX/debug-info-anon-union-vars.cpp (original)
+++ cfe/trunk/test/CodeGenCXX/debug-info-anon-union-vars.cpp Tue Feb 23
13:10:16 2016
@@ -44,12 +44,7 @@ void instantiate(int x) {
buildBytes(x);
}
-// CHECK: ![[UNION:[0-9]+]] = !DICompositeType(tag: DW_TAG_union_type,
-// CHECK-NOT: name:
-// CHECK: elements
// CHECK: [[FILE:.*]] = !DIFile(filename:
"{{.*}}debug-info-anon-union-vars.cpp",
-// CHECK: !DIDerivedType(tag: DW_TAG_member, name: "i", scope: ![[UNION]],
-// CHECK: !DIDerivedType(tag: DW_TAG_member, name: "c", scope: ![[UNION]],
// CHECK: !DIGlobalVariable(name: "c",{{.*}} file: [[FILE]], line: 6,{{.*}}
isLocal: true, isDefinition: true
// CHECK: !DIGlobalVariable(name: "d",{{.*}} file: [[FILE]], line: 6,{{.*}}
isLocal: true, isDefinition: true
// CHECK: !DIGlobalVariable(name: "a",{{.*}} file: [[FILE]], line: 6,{{.*}}
isLocal: true, isDefinition: true
@@ -60,4 +55,9 @@ void instantiate(int x) {
// CHECK: !DILocalVariable(name: "c", {{.*}}, flags: DIFlagArtificial
// CHECK: !DILocalVariable(
// CHECK-NOT: name:
-// CHECK: type: ![[UNION]]
+// CHECK: type: ![[UNION:[0-9]+]]
+// CHECK: ![[UNION]] = !DICompositeType(tag: DW_TAG_union_type,
+// CHECK-NOT: name:
+// CHECK: elements
+// CHECK: !DIDerivedType(tag: DW_TAG_member, name: "i", scope: ![[UNION]],
+// CHECK: !DIDerivedType(tag: DW_TAG_member, name: "c", scope: ![[UNION]],
Removed: cfe/trunk/test/CodeGenCXX/debug-info-lb.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/debug-info-lb.cpp?rev=261669&view=auto
==============================================================================
--- cfe/trunk/test/CodeGenCXX/debug-info-lb.cpp (original)
+++ cfe/trunk/test/CodeGenCXX/debug-info-lb.cpp (removed)
@@ -1,27 +0,0 @@
-// RUN: %clang_cc1 -triple x86_64-none-linux-gnu -emit-llvm
-debug-info-kind=limited %s -o - | FileCheck %s
-
-void foo() {
- static int bar = 1;
- {
- struct X {};
- typedef char Y;
- static int bar = 0;
- // The following basic block is intended, in order to check the case where
- // types "X", "Y" are defined in a different scope than where they are
used.
- // They should have the scope they are defined at as their parent scope.
- {
- X a;
- Y b;
- }
- }
-}
-
-// CHECK: !{{[0-9]+}} = !DICompositeType(tag: DW_TAG_structure_type, name:
"X", scope: [[LBScope:![0-9]+]],
-// CHECK: [[LBScope]] = distinct !DILexicalBlock(scope: !{{[0-9]+}}, file:
!{{[0-9]+}}, line: 5)
-
-// CHECK: [[FuncScope:![0-9]+]] = distinct !DISubprogram(name: "foo",
-
-// CHECK: !{{[0-9]+}} = !DIDerivedType(tag: DW_TAG_typedef, name: "Y", scope:
[[LBScope]],
-// CHECK: !{{[0-9]+}} = !DIGlobalVariable(name: "bar", scope: [[FuncScope]],
file: !{{[0-9]+}}, line: 4
-// CHECK: !{{[0-9]+}} = !DIGlobalVariable(name: "bar", scope: [[LBScope]],
file: !{{[0-9]+}}, line: 8
-
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
