Fix a regression caused by my rewriting of cast of ivar

access (was radar 7575882).

llvm-svn: 94481

2 files changed, 17 insertions, 9 deletions

diff --git a/clang/lib/Frontend/RewriteObjC.cpp b/clang/lib/Frontend/RewriteObjC.cpp
index 19c714da3da..e473adbf9e7 100644
--- a/clang/lib/Frontend/RewriteObjC.cpp
+++ b/clang/lib/Frontend/RewriteObjC.cpp
@@ -4308,15 +4308,17 @@ void RewriteObjC::RewriteCastExpr(CStyleCastExpr *CE) {
                 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;
diff --git a/clang/test/Rewriter/rewrite-cast-ivar-access.mm b/clang/test/Rewriter/rewrite-cast-ivar-access.mm
index bdda6895121..177824d0263 100644
--- a/clang/test/Rewriter/rewrite-cast-ivar-access.mm
+++ b/clang/test/Rewriter/rewrite-cast-ivar-access.mm
@@ -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)