diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2014-12-02 18:42:51 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2014-12-02 18:42:51 +0000 |
| commit | 05834e2d5b0caf4a960570d0e6efe654da1cbb79 (patch) | |
| tree | db90b9209944b29d492497a0fc78b4e80c3ba495 | |
| parent | 15520db9adce8413ef02fd6ffc68ee6aa8d182f0 (diff) | |
| download | bcm5719-llvm-05834e2d5b0caf4a960570d0e6efe654da1cbb79.tar.gz bcm5719-llvm-05834e2d5b0caf4a960570d0e6efe654da1cbb79.zip | |
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
| -rw-r--r-- | clang/lib/AST/Mangle.cpp | 6 | ||||
| -rw-r--r-- | clang/test/CodeGenCXX/predefined-expr.cpp | 32 |
2 files changed, 36 insertions, 2 deletions
diff --git a/clang/lib/AST/Mangle.cpp b/clang/lib/AST/Mangle.cpp index 53ee442bd84..1a061c4f663 100644 --- a/clang/lib/AST/Mangle.cpp +++ b/clang/lib/AST/Mangle.cpp @@ -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 { diff --git a/clang/test/CodeGenCXX/predefined-expr.cpp b/clang/test/CodeGenCXX/predefined-expr.cpp index f901467c4f4..6bdc2cec4be 100644 --- a/clang/test/CodeGenCXX/predefined-expr.cpp +++ b/clang/test/CodeGenCXX/predefined-expr.cpp @@ -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_ |
