[cfe-commits] r94444 - in /cfe/trunk: lib/Frontend/RewriteObjC.cpp test/Rewriter/rewrite-cast-ivar-access.mm

[Fariborz Jahanian]

Author: fjahanian
Date: Mon Jan 25 14:50:02 2010
New Revision: 94444

URL: http://llvm.org/viewvc/llvm-project?rev=94444&view=rev
Log:
Fixes a rewriting bug of access ivar of a variable cast
to subclass. (Fixes radar 7575882).


Added:
    cfe/trunk/test/Rewriter/rewrite-cast-ivar-access.mm
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=94444&r1=94443&r2=94444&view=diff

==============================================================================
--- cfe/trunk/lib/Frontend/RewriteObjC.cpp (original)
+++ cfe/trunk/lib/Frontend/RewriteObjC.cpp Mon Jan 25 14:50:02 2010
@@ -4308,7 +4308,16 @@
                 TypeAsString.c_str(), TypeAsString.size());
     return;
   }
-  
+  if (QT->isObjCObjectPointerType()) {
+    QualType ptee = QT->getAs<ObjCObjectPointerType>()->getPointeeType();
+    std::string TypeAsString = "(struct ";
+    TypeAsString += ptee.getAsString();
+    TypeAsString += "_IMPL *";
+    TypeAsString += ")";
+    ReplaceText(LocStart, endBuf-startBuf+1, 
+                TypeAsString.c_str(), TypeAsString.size());
+      return;    
+  }
   // advance the location to startArgList.
   const char *argPtr = startBuf;
 

Added: cfe/trunk/test/Rewriter/rewrite-cast-ivar-access.mm
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Rewriter/rewrite-cast-ivar-access.mm?rev=94444&view=auto

==============================================================================
--- cfe/trunk/test/Rewriter/rewrite-cast-ivar-access.mm (added)
+++ cfe/trunk/test/Rewriter/rewrite-cast-ivar-access.mm Mon Jan 25 14:50:02 2010
@@ -0,0 +1,24 @@
+// 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 7575882
+
+ at interface F {
+  int supervar;
+}
+ at end
+
+ at interface G : F {
+ at public
+  int ivar;
+}
+ at end
+
+ at implementation G
+- (void)foo:(F *)arg {
+        int q = arg->supervar;
+        int v = ((G *)arg)->ivar;
+}
+ at end
+
+// CHECK-LP: ((struct G_IMPL *)arg)->ivar
+