[cfe-commits] r92924 - in /cfe/trunk: lib/Frontend/RewriteObjC.cpp test/Rewriter/rewrite-ivar-use.m

[Fariborz Jahanian]

Author: fjahanian
Date: Thu Jan  7 12:18:32 2010
New Revision: 92924

URL: http://llvm.org/viewvc/llvm-project?rev=92924&view=rev
Log:
Fix rewriting of ivars. Fixes radar 7490331.


Added:
    cfe/trunk/test/Rewriter/rewrite-ivar-use.m
Modified:
    cfe/trunk/lib/Frontend/RewriteObjC.cpp

Modified: cfe/trunk/lib/Frontend/RewriteObjC.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/RewriteObjC.cpp?rev=92924&r1=92923&r2=92924&view=diff

==============================================================================
--- cfe/trunk/lib/Frontend/RewriteObjC.cpp (original)
+++ cfe/trunk/lib/Frontend/RewriteObjC.cpp Thu Jan  7 12:18:32 2010
@@ -1183,10 +1183,11 @@
 Stmt *RewriteObjC::RewriteObjCIvarRefExpr(ObjCIvarRefExpr *IV,
                                           SourceLocation OrigStart) {
   ObjCIvarDecl *D = IV->getDecl();
+  const Expr *BaseExpr = IV->getBase();
   if (CurMethodDef) {
-    if (const PointerType *pType = IV->getBase()->getType()->getAs<PointerType>()) {
+    if (IV->isArrow()) {
       ObjCInterfaceType *iFaceDecl =
-        dyn_cast<ObjCInterfaceType>(pType->getPointeeType());
+        dyn_cast<ObjCInterfaceType>(BaseExpr->getType()->getPointeeType());
       // lookup which class implements the instance variable.
       ObjCInterfaceDecl *clsDeclared = 0;
       iFaceDecl->getDecl()->lookupInstanceVariable(D->getIdentifier(),

Added: cfe/trunk/test/Rewriter/rewrite-ivar-use.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Rewriter/rewrite-ivar-use.m?rev=92924&view=auto

==============================================================================
--- cfe/trunk/test/Rewriter/rewrite-ivar-use.m (added)
+++ cfe/trunk/test/Rewriter/rewrite-ivar-use.m Thu Jan  7 12:18:32 2010
@@ -0,0 +1,20 @@
+// RUN: %clang_cc1 -rewrite-objc %s -o -
+// radar 7490331
+
+ at interface Foo {
+        int a;
+        id b;
+}
+- (void)bar;
+- (void)baz:(id)q;
+ at end
+
+ at implementation Foo
+- (void)bar {
+        a = 42;
+        [self baz:b];
+}
+- (void)baz:(id)q {
+}
+ at end
+