diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2010-02-05 17:48:10 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2010-02-05 17:48:10 +0000 |
| commit | 376338a68d467f076c2ae5fa614ec0286ea74d7c (patch) | |
| tree | 57f9653b5e4e89ee23fdce1de0ff1ece7b0645b1 | |
| parent | 88906cddbb1d5b3a868eeeec6cb170befc829c2f (diff) | |
Fixes a minor rewriter bug messaging inside a function call.
Fixes radar 7617047.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@95392 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Frontend/RewriteObjC.cpp | 6 | ||||
| -rw-r--r-- | test/Rewriter/rewrite-message-expr.mm | 27 |
2 files changed, 32 insertions, 1 deletions
diff --git a/lib/Frontend/RewriteObjC.cpp b/lib/Frontend/RewriteObjC.cpp index dcd83c61bf..b90babda5c 100644 --- a/lib/Frontend/RewriteObjC.cpp +++ b/lib/Frontend/RewriteObjC.cpp @@ -1310,7 +1310,11 @@ Stmt *RewriteObjC::RewriteObjCNestedIvarRefExpr(Stmt *S, bool &replaced) { Stmt *newStmt = RewriteObjCIvarRefExpr(IvarRefExpr, OrigStmtRange.getBegin(), replaced); return newStmt; - } + } + if (ObjCMessageExpr *MsgRefExpr = dyn_cast<ObjCMessageExpr>(S)) { + Stmt *newStmt = SynthMessageExpr(MsgRefExpr); + return newStmt; + } return S; } diff --git a/test/Rewriter/rewrite-message-expr.mm b/test/Rewriter/rewrite-message-expr.mm new file mode 100644 index 0000000000..b0fba2f8be --- /dev/null +++ b/test/Rewriter/rewrite-message-expr.mm @@ -0,0 +1,27 @@ +// RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc %s -o %t-rw.cpp +// RUN: FileCheck -check-prefix LP --input-file=%t-rw.cpp %s +// radar 7617047 + +#include <objc/objc.h> + +@interface Baz +- (id)y; ++ (id)z; +@end + +@interface Foo { +@public + int bar; +} +@end + +extern Foo* x(id a); + +int f(Baz *baz) { + int i = x([Baz z])->bar; + int j = ((Foo*)[Baz z])->bar; + int k = x([baz y])->bar; + return i+j+k; +} + +// CHECK-LP: ((struct Foo_IMPL *)x(((id (*)(id, SEL))(void *)objc_msgSend)(objc_getClass("Baz"), sel_registerName("z"))))->bar |