From eecd39f2d7a731a0525ecf0aaa2b00ed498a9b03 Mon Sep 17 00:00:00 2001 From: Mike Stump Date: Tue, 17 Feb 2009 23:25:52 +0000 Subject: [PATCH] Avoid getNameAsCString when the decl doesn't have a name. Build of the parm list with the iterator, not end(). llvm-svn: 64851 --- clang/lib/CodeGen/CGBlocks.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/clang/lib/CodeGen/CGBlocks.cpp b/clang/lib/CodeGen/CGBlocks.cpp index 783606cc46a4..4a940960730e 100644 --- a/clang/lib/CodeGen/CGBlocks.cpp +++ b/clang/lib/CodeGen/CGBlocks.cpp @@ -149,7 +149,8 @@ llvm::Constant *CodeGenFunction::BuildBlockLiteralTmp(const BlockExpr *BE) { // __FuncPtr const char *Name = ""; if (const NamedDecl *ND = dyn_cast(CurFuncDecl)) - Name = ND->getNameAsCString(); + if (ND->getIdentifier()) + Name = ND->getNameAsCString(); BlockInfo Info(0, Name); llvm::Function *Fn = CodeGenFunction(*this).GenerateBlockFunction(BE, Info); Elts.push_back(Fn); @@ -371,7 +372,7 @@ llvm::Function *CodeGenFunction::GenerateBlockFunction(const BlockExpr *Expr, for (BlockDecl::param_iterator i = BD->param_begin(), e = BD->param_end(); i != e; ++i) - Args.push_back(std::make_pair(*e, (*e)->getType())); + Args.push_back(std::make_pair(*i, (*i)->getType())); const CGFunctionInfo &FI = CGM.getTypes().getFunctionInfo(FTy->getResultType(), Args);