diff options
| author | Steve Naroff <snaroff@apple.com> | 2009-02-02 17:19:26 +0000 |
|---|---|---|
| committer | Steve Naroff <snaroff@apple.com> | 2009-02-02 17:19:26 +0000 |
| commit | df8570d1ff98155b74df2a0544068f40b4fd5195 (patch) | |
| tree | e9e3743d6b4eab9db51608f3a2f8f1c951f89daf | |
| parent | 839508150a7a595b6172217eeddc4d024fc201c5 (diff) | |
RewriteObjC::RewriteBlockDeclRefExpr(): Add parens to enforce precedence. This fixes <rdar://problem/6529468> clang ObjC rewriter: Need parenthesis around dereferences in rewritten Blocks.
Also changed RewriteObjC::SynthesizeBlockFunc() to declare a pointer to the block argument even when there are no user-supplied arguments to the block.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@63522 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | Driver/RewriteObjC.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Driver/RewriteObjC.cpp b/Driver/RewriteObjC.cpp index e2ddafe8d1..f18a0c53ce 100644 --- a/Driver/RewriteObjC.cpp +++ b/Driver/RewriteObjC.cpp @@ -3458,7 +3458,9 @@ std::string RewriteObjC::SynthesizeBlockFunc(BlockExpr *CE, int i, BlockDecl *BD = CE->getBlockDecl(); if (isa<FunctionTypeNoProto>(AFT)) { - S += "()"; + // No user-supplied arguments. Still need to pass in a pointer to the + // block (to reference imported block decl refs). + S += "(" + StructRef + " *__cself)"; } else if (BD->param_empty()) { S += "(" + StructRef + " *__cself)"; } else { @@ -3842,7 +3844,12 @@ void RewriteObjC::RewriteBlockCall(CallExpr *Exp) { void RewriteObjC::RewriteBlockDeclRefExpr(BlockDeclRefExpr *BDRE) { // FIXME: Add more elaborate code generation required by the ABI. - InsertText(BDRE->getLocStart(), "*", 1); + Expr *DerefExpr = new UnaryOperator(BDRE, UnaryOperator::Deref, + Context->getPointerType(BDRE->getType()), + SourceLocation()); + // Need parens to enforce precedence. + ParenExpr *PE = new ParenExpr(SourceLocation(), SourceLocation(), DerefExpr); + ReplaceStmt(BDRE, PE); } void RewriteObjC::RewriteCastExpr(CStyleCastExpr *CE) { |