I've been using no-asserts build, and it led to segfault, so probably it was required. I see that Reid already proceeded with the revert. I will still work on a reproducer.
On Thu, Mar 24, 2016 at 1:43 PM, Aboud, Amjad <amjad.ab...@intel.com> wrote: > I believe it is safe to disable the assertion. > > I added this assertion...I am trying to figure out why we are hitting it. > > > > I am not convinced that we should do a total revert. > > > > Regards, > > Amjad > > > > *From:* Alexey Samsonov [mailto:vonos...@gmail.com] > *Sent:* Thursday, March 24, 2016 22:27 > *To:* Aboud, Amjad <amjad.ab...@intel.com> > *Cc:* cfe-commits <cfe-commits@lists.llvm.org> > *Subject:* Re: r264281 - Recommitted r263425 "Supporting all entities > declared in lexical scope in LLVM debug info." > > > > Heads-up: I see segmentation faults in Clang following this revision. I > will try to come up with a standalone reproducer and update > https://llvm.org/bugs/show_bug.cgi?id=26942, possibly reverting this > change. > > > > On Thu, Mar 24, 2016 at 6:30 AM, Amjad Aboud via cfe-commits < > cfe-commits@lists.llvm.org> wrote: > > Author: aaboud > Date: Thu Mar 24 08:30:41 2016 > New Revision: 264281 > > URL: http://llvm.org/viewvc/llvm-project?rev=264281&view=rev > Log: > Recommitted r263425 "Supporting all entities declared in lexical scope in > LLVM debug info." > After fixing PR26942 (the fix is included in this commit). > > Differential Revision: http://reviews.llvm.org/D18350 > > Added: > cfe/trunk/test/CodeGenCXX/debug-info-lb.cpp > - copied unchanged from r263435, > 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=264281&r1=264280&r2=264281&view=diff > > ============================================================================== > --- cfe/trunk/lib/CodeGen/CGDebugInfo.cpp (original) > +++ cfe/trunk/lib/CodeGen/CGDebugInfo.cpp Thu Mar 24 08:30:41 2016 > @@ -831,15 +831,18 @@ 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 = Ty->getDecl()->getLocation(); > + SourceLocation Loc = TD->getLocation(); > + > + llvm::DIScope *TDContext = getDeclarationLexicalScope(*TD, QualType(Ty, > 0)); > > // Typedefs are derived from some other type. > return DBuilder.createTypedef( > getOrCreateType(Ty->getDecl()->getUnderlyingType(), Unit), > Ty->getDecl()->getName(), getOrCreateFile(Loc), getLineNumber(Loc), > - getDeclContextDescriptor(Ty->getDecl())); > + TDContext); > } > > llvm::DIType *CGDebugInfo::CreateType(const FunctionType *Ty, > @@ -1472,6 +1475,23 @@ 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; > @@ -2057,7 +2077,7 @@ llvm::DIType *CGDebugInfo::CreateEnumTyp > // 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::DIScope *EDContext = getDeclarationLexicalScope(*ED, > QualType(Ty, 0)); > llvm::DIFile *DefUnit = getOrCreateFile(ED->getLocation()); > llvm::TempDIScope TmpContext(DBuilder.createReplaceableCompositeType( > llvm::dwarf::DW_TAG_enumeration_type, "", TheCU, DefUnit, 0)); > @@ -2101,7 +2121,7 @@ llvm::DIType *CGDebugInfo::CreateTypeDef > > llvm::DIFile *DefUnit = getOrCreateFile(ED->getLocation()); > unsigned Line = getLineNumber(ED->getLocation()); > - llvm::DIScope *EnumContext = getDeclContextDescriptor(ED); > + llvm::DIScope *EnumContext = getDeclarationLexicalScope(*ED, > QualType(Ty, 0)); > llvm::DIType *ClassTy = > ED->isFixed() ? getOrCreateType(ED->getIntegerType(), DefUnit) : > nullptr; > return DBuilder.createEnumerationType(EnumContext, ED->getName(), > DefUnit, > @@ -2362,7 +2382,7 @@ llvm::DICompositeType *CGDebugInfo::Crea > unsigned Line = getLineNumber(RD->getLocation()); > StringRef RDName = getClassName(RD); > > - llvm::DIScope *RDContext = getDeclContextDescriptor(RD); > + llvm::DIScope *RDContext = getDeclarationLexicalScope(*RD, QualType(Ty, > 0)); > > // If we ended up creating the type during the context chain > construction, > // just return that. > @@ -2509,8 +2529,15 @@ void CGDebugInfo::collectVarDeclProps(co > if (DC->isRecord()) > DC = CGM.getContext().getTranslationUnitDecl(); > > - llvm::DIScope *Mod = getParentModuleOrNull(VD); > - VDContext = getContextDescriptor(cast<Decl>(DC), Mod ? Mod : TheCU); > + 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::DISubprogram * > > Modified: cfe/trunk/lib/CodeGen/CGDebugInfo.h > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDebugInfo.h?rev=264281&r1=264280&r2=264281&view=diff > > ============================================================================== > --- cfe/trunk/lib/CodeGen/CGDebugInfo.h (original) > +++ cfe/trunk/lib/CodeGen/CGDebugInfo.h Thu Mar 24 08:30:41 2016 > @@ -116,6 +116,11 @@ 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 > @@ -378,6 +383,12 @@ 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=264281&r1=264280&r2=264281&view=diff > > ============================================================================== > --- cfe/trunk/lib/CodeGen/CGDecl.cpp (original) > +++ cfe/trunk/lib/CodeGen/CGDecl.cpp Thu Mar 24 08:30:41 2016 > @@ -87,11 +87,7 @@ 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::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::Function: // void X(); > case Decl::StaticAssert: // static_assert(X, ""); [C++0x] > case Decl::Label: // __label__ x; > case Decl::Import: > @@ -101,13 +97,21 @@ 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()) > @@ -128,6 +132,9 @@ 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=264281&r1=264280&r2=264281&view=diff > > ============================================================================== > --- cfe/trunk/test/CodeGenCXX/debug-info-anon-union-vars.cpp (original) > +++ cfe/trunk/test/CodeGenCXX/debug-info-anon-union-vars.cpp Thu Mar 24 > 08:30:41 2016 > @@ -44,7 +44,12 @@ 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 > @@ -55,9 +60,4 @@ void instantiate(int x) { > // CHECK: !DILocalVariable(name: "c", {{.*}}, flags: DIFlagArtificial > // CHECK: !DILocalVariable( > // CHECK-NOT: name: > -// 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]], > +// CHECK: type: ![[UNION]] > > > _______________________________________________ > cfe-commits mailing list > cfe-commits@lists.llvm.org > http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits > > > > > > -- > > Alexey Samsonov > vonos...@gmail.com > > --------------------------------------------------------------------- > Intel Israel (74) Limited > > This e-mail and any attachments may contain confidential material for > the sole use of the intended recipient(s). Any review or distribution > by others is strictly prohibited. If you are not the intended > recipient, please contact the sender and delete all copies. > -- Alexey Samsonov vonos...@gmail.com
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
