maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

This patch fixes a crash involving use of predefined 

expressions. It fixes crash when mangling name for block's helper
function used inside a constructor/destructor. 
rdar://19065361.

llvm-svn: 223136
This commit is contained in:
Fariborz Jahanian 2014-12-02 18:42:51 +00:00
parent 15520db9ad
commit 05834e2d5b
2 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clang/lib/AST/Mangle.cpp
View File

@ -236,7 +236,11 @@ void MangleContext::mangleBlock(const DeclContext *DC, const BlockDecl *BD,
(void) getBlockId(cast<BlockDecl>(DC), true);
assert((isa<TranslationUnitDecl>(DC) || isa<NamedDecl>(DC)) &&
"expected a TranslationUnitDecl or a NamedDecl");
if (auto ND = dyn_cast<NamedDecl>(DC)) {
if (const auto *CD = dyn_cast<CXXConstructorDecl>(DC))
mangleCtorBlock(CD, /*CT*/ Ctor_Complete, BD, Out);
else if (const auto *DD = dyn_cast<CXXDestructorDecl>(DC))
mangleDtorBlock(DD, /*DT*/ Dtor_Complete, BD, Out);
else if (auto ND = dyn_cast<NamedDecl>(DC)) {
if (!shouldMangleDeclName(ND) && ND->getIdentifier())
Stream << ND->getIdentifier()->getName();
else {

32
clang/test/CodeGenCXX/predefined-expr.cpp
View File

@ -1,4 +1,4 @@
// RUN: %clang_cc1 -std=c++11 %s -triple %itanium_abi_triple -emit-llvm -o - | FileCheck %s
// RUN: %clang_cc1 -std=c++11 -fblocks %s -triple %itanium_abi_triple -emit-llvm -o - | FileCheck %s
// CHECK: private unnamed_addr constant [15 x i8] c"externFunction\00"
// CHECK: private unnamed_addr constant [26 x i8] c"void NS::externFunction()\00"
@ -537,3 +537,33 @@ int main() {
return 0;
}
// rdar://19065361
class XXX {
XXX();
~XXX();
};
void XXLog(const char *functionName) { }
typedef void (^notify_handler_t)(int token);
typedef void (^dispatch_block_t)(void);
void notify_register_dispatch(notify_handler_t handler);
void _dispatch_once(dispatch_block_t block);
XXX::XXX()
{
_dispatch_once(^{ notify_register_dispatch( ^(int token) { XXLog(__FUNCTION__); });
});
}
// CHECK: define internal void @___ZN3XXXC2Ev_block_invoke_
XXX::~XXX()
{
_dispatch_once(^{ notify_register_dispatch( ^(int token) { XXLog(__FUNCTION__); });
});
}
// CHECK: define internal void @___ZN3XXXD2Ev_block_invoke_