more of rewriting ivar types.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@150353 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 6 insertions, 2 deletions

diff --git a/lib/Rewrite/RewriteModernObjC.cpp b/lib/Rewrite/RewriteModernObjC.cpp
index 26646901f0..fdde873ec9 100644
--- a/lib/Rewrite/RewriteModernObjC.cpp
+++ b/lib/Rewrite/RewriteModernObjC.cpp
@@ -3174,9 +3174,13 @@ void RewriteModernObjC::RewriteObjCInternalStruct(ObjCInterfaceDecl *CDecl,
   for (unsigned i = 0, e = IVars.size(); i < e; i++) {
     ObjCIvarDecl *IvarDecl = IVars[i];
     QualType Type = IvarDecl->getType();
-    std::string TypeString(Type.getAsString(Context->getPrintingPolicy()));
+    std::string Name = IvarDecl->getNameAsString();
+
     Result += "\t";
-    Result += TypeString; Result += " "; Result += IvarDecl->getNameAsString();
+    convertToUnqualifiedObjCType(Type);
+    convertBlockPointerToFunctionPointer(Type);
+    Type.getAsStringInternal(Name, Context->getPrintingPolicy());
+    Result += Name;
     if (IvarDecl->isBitField()) {
       Result += " : "; Result += utostr(IvarDecl->getBitWidthValue(*Context));
     }