dnrops
/
clang
mirror of https://github.com/microsoft/clang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a crash when emitting dbeug info for forward-declared scoped enums. 

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.

<rdar://problem/24493203>

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@259975 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Adrian Prantl 2016-02-06 01:59:09 +00:00
parent 208c623c2b
commit 6fbed68720
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/CodeGen/CGDebugInfo.cpp
View File

@ -2051,13 +2051,25 @@ llvm::DIType *CGDebugInfo::CreateEnumType(const EnumType *Ty) {
// If this is just a forward declaration, construct an appropriately // If this is just a forward declaration, construct an appropriately
// marked node and just return it. // marked node and just return it.
if (isImportedFromModule || !ED->getDefinition()) { if (isImportedFromModule || !ED->getDefinition()) {
llvm::DIScope *EDContext = getDeclContextDescriptor(ED);
llvm::DIFile *DefUnit = getOrCreateFile(ED->getLocation()); 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::DIScope *EDContext = DBuilder.createReplaceableCompositeType(
llvm::dwarf::DW_TAG_enumeration_type, "", TheCU, DefUnit, 0);
unsigned Line = getLineNumber(ED->getLocation()); unsigned Line = getLineNumber(ED->getLocation());
StringRef EDName = ED->getName(); StringRef EDName = ED->getName();
llvm::DIType *RetTy = DBuilder.createReplaceableCompositeType( llvm::DIType *RetTy = DBuilder.createReplaceableCompositeType(
llvm::dwarf::DW_TAG_enumeration_type, EDName, EDContext, DefUnit, Line, llvm::dwarf::DW_TAG_enumeration_type, EDName, EDContext, DefUnit, Line,
0, Size, Align, llvm::DINode::FlagFwdDecl, FullName); 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);
EDContext->replaceAllUsesWith(getDeclContextDescriptor(ED));
ReplaceMap.emplace_back( ReplaceMap.emplace_back(
std::piecewise_construct, std::make_tuple(Ty), std::piecewise_construct, std::make_tuple(Ty),
std::make_tuple(static_cast<llvm::Metadata *>(RetTy))); std::make_tuple(static_cast<llvm::Metadata *>(RetTy)));

15
test/CodeGenCXX/debug-info-scoped-class.cpp Normal file
View File

@ -0,0 +1,15 @@
// RUN: %clang_cc1 -emit-llvm -debug-info-kind=standalone -std=c++11 \
// RUN: -triple thumbv7-apple-ios %s -o - | FileCheck %s
// This forward-declared scoped enum will be created while building its own
// declcontext. Make sure it is only emitted once.
struct A {
enum class Return;
Return f1();
};
A::Return* f2() {}
// CHECK: !DICompositeType(tag: DW_TAG_enumeration_type, name: "Return",
// CHECK-SAME: flags: DIFlagFwdDecl,
// CHECK-NOT: tag: DW_TAG_enumeration_type, name: "Return"