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

[Fariborz Jahanian]

Author: fjahanian
Date: Mon Jan 25 18:29:22 2010
New Revision: 94481

URL: http://llvm.org/viewvc/llvm-project?rev=94481&view=rev
Log:
Fix a regression caused by my rewriting of cast of ivar
access (was radar 7575882).


Modified:
    cfe/trunk/lib/Frontend/RewriteObjC.cpp
    cfe/trunk/test/Rewriter/rewrite-cast-ivar-access.mm

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

==============================================================================
--- cfe/trunk/lib/Frontend/RewriteObjC.cpp (original)
+++ cfe/trunk/lib/Frontend/RewriteObjC.cpp Mon Jan 25 18:29:22 2010
@@ -4308,15 +4308,17 @@
                 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;    
+  if (LangOpts.Microsoft && QT->isObjCObjectPointerType()) {
+    if (isa<ObjCInterfaceType>(QT->getPointeeType())) {
+      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;

Modified: 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=94481&r1=94480&r2=94481&view=diff

==============================================================================
--- cfe/trunk/test/Rewriter/rewrite-cast-ivar-access.mm (original)
+++ cfe/trunk/test/Rewriter/rewrite-cast-ivar-access.mm Mon Jan 25 18:29:22 2010
@@ -20,5 +20,11 @@
 }
 @end
 
+void objc_assign_strongCast(id);
+void __CFAssignWithWriteBarrier(void **location, void *value) {
+        objc_assign_strongCast((id)value);
+}
+
 // CHECK-LP: ((struct G_IMPL *)arg)->ivar
 
+// CHECK-LP: objc_assign_strongCast((id)value)