diff options
| -rw-r--r-- | include/clang/AST/ASTContext.h | 9 | ||||
| -rw-r--r-- | lib/AST/ASTContext.cpp | 14 | ||||
| -rw-r--r-- | lib/Sema/SemaDecl.cpp | 21 |
3 files changed, 44 insertions, 0 deletions
diff --git a/include/clang/AST/ASTContext.h b/include/clang/AST/ASTContext.h index 848f76bfa7..87a210f661 100644 --- a/include/clang/AST/ASTContext.h +++ b/include/clang/AST/ASTContext.h @@ -129,6 +129,9 @@ class ASTContext { /// \brief Mapping from ObjCContainers to their ObjCImplementations. llvm::DenseMap<ObjCContainerDecl*, ObjCImplDecl*> ObjCImpls; + /// \brief Mapping from __block VarDecls to their copy initialization expr. + llvm::DenseMap<VarDecl*, Expr*> BlockVarCopyInits; + /// \brief Representation of a "canonical" template template parameter that /// is used in canonical template names. class CanonicalTemplateTemplateParm : public llvm::FoldingSetNode { @@ -1358,6 +1361,12 @@ public: /// \brief Set the implementation of ObjCCategoryDecl. void setObjCImplementation(ObjCCategoryDecl *CatD, ObjCCategoryImplDecl *ImplD); + + /// \brief Set the copy inialization expression of a block var decl. + void setBlockVarCopyInits(VarDecl*VD, Expr* Init); + /// \brief Get the copy initialization expression of VarDecl,or NULL if + /// none exists. + Expr *getBlockVarCopyInits(VarDecl*VD); /// \brief Allocate an uninitialized TypeSourceInfo. /// diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp index e5081e384f..e1797665c9 100644 --- a/lib/AST/ASTContext.cpp +++ b/lib/AST/ASTContext.cpp @@ -1008,6 +1008,20 @@ void ASTContext::setObjCImplementation(ObjCCategoryDecl *CatD, ObjCImpls[CatD] = ImplD; } +/// \brief Get the copy initialization expression of VarDecl,or NULL if +/// none exists. +Expr *ASTContext::getBlockVarCopyInits(VarDecl*VD) { + llvm::DenseMap<VarDecl*, Expr*>::iterator + I = BlockVarCopyInits.find(VD); + return (I != BlockVarCopyInits.end()) ? cast<Expr>(I->second) : 0; +} + +/// \brief Set the copy inialization expression of a block var decl. +void ASTContext::setBlockVarCopyInits(VarDecl*VD, Expr* Init) { + assert(VD && Init && "Passed null params"); + BlockVarCopyInits[VD] = Init; +} + /// \brief Allocate an uninitialized TypeSourceInfo. /// /// The caller should initialize the memory held by TypeSourceInfo using diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index 786a13f1d3..7b0afe1963 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -3022,6 +3022,27 @@ Sema::ActOnVariableDeclarator(Scope *S, Declarator &D, DeclContext *DC, if (NewVD->getLinkage() == ExternalLinkage && !DC->isRecord()) AddPushedVisibilityAttribute(NewVD); + + // For variables declared as __block which require copy construction, + // must capture copy initialization expression here. + if (getLangOptions().CPlusPlus && NewVD->hasAttr<BlocksAttr>()) { + QualType T = NewVD->getType(); + if (!T->isDependentType() && !T->isReferenceType() && + T->getAs<RecordType>() && !T->isUnionType()) { + Expr *E = new (Context) DeclRefExpr(NewVD, T, + VK_LValue, SourceLocation()); + ExprResult Res = PerformCopyInitialization( + InitializedEntity::InitializeBlock(NewVD->getLocation(), + T, false), + SourceLocation(), + Owned(E)); + if (!Res.isInvalid()) { + Res = MaybeCreateCXXExprWithTemporaries(Res.get()); + Expr *Init = Res.takeAs<Expr>(); + Context.setBlockVarCopyInits(NewVD, Init); + } + } + } MarkUnusedFileScopedDecl(NewVD); return NewVD; |