commit 8f4903397df26a397aae29188c1346ff6812ddd0
author Fariborz Jahanian <fjahanian@apple.com> Sat Feb 26 01:31:36 2011 +0000
committer Fariborz Jahanian <fjahanian@apple.com> Sat Feb 26 01:31:36 2011 +0000
tree 28b59b0092943dddfe5cb48604febdf7b9ea04ab
parent f2890fc93f7a59763813d5f8a9a501e9fed9b395

Fix objc rewriting bug casting to qualified objective-c pointetr.
// rdar://9056351

llvm-svn: 126536

clang/lib/Rewrite/RewriteObjC.cpp

diff --git a/clang/lib/Rewrite/RewriteObjC.cpp b/clang/lib/Rewrite/RewriteObjC.cpp
index 9def4da..0263f65 100644
--- a/clang/lib/Rewrite/RewriteObjC.cpp
+++ b/clang/lib/Rewrite/RewriteObjC.cpp
@@ -2988,9 +2988,9 @@
     // Make all implicit casts explicit...ICE comes in handy:-)
     if (ImplicitCastExpr *ICE = dyn_cast<ImplicitCastExpr>(userExpr)) {
       // Reuse the ICE type, it is exactly what the doctor ordered.
-      QualType type = ICE->getType()->isObjCQualifiedIdType()
-                                ? Context->getObjCIdType()
-                                : ICE->getType();
+      QualType type = ICE->getType();
+      if (needToScanForQualifiers(type))
+        type = Context->getObjCIdType();
       // Make sure we convert "type (^)(...)" to "type (*)(...)".
       (void)convertBlockPointerToFunctionPointer(type);
       userExpr = NoTypeInfoCStyleCastExpr(Context, type, CK_BitCast,