objective-c modern translator. Fixes misc. bug in writing

the ivar offset symbol.

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

diff --git a/lib/Rewrite/RewriteModernObjC.cpp b/lib/Rewrite/RewriteModernObjC.cpp
index db1f5ff4713e89ca54f7c2df775393217accfc61..41aaafaaa3be5c419e664a4460a73b9fb797964f 100644 (file)
--- a/lib/Rewrite/RewriteModernObjC.cpp
+++ b/lib/Rewrite/RewriteModernObjC.cpp
@@ -6533,14 +6533,14 @@ Stmt *RewriteModernObjC::RewriteObjCIvarRefExpr(ObjCIvarRefExpr *IV) {
                                               SourceLocation(),
                                               addExpr);
       QualType IvarT = D->getType();
-      convertBlockPointerToFunctionPointer(IvarT);
+      convertObjCTypeToCStyleType(IvarT);
       QualType castT = Context->getPointerType(IvarT);
       
       castExpr = NoTypeInfoCStyleCastExpr(Context, 
                                           castT,
                                           CK_BitCast,
                                           PE);
-      Expr *Exp = new (Context) UnaryOperator(castExpr, UO_Deref, castT,
+      Expr *Exp = new (Context) UnaryOperator(castExpr, UO_Deref, IvarT,
                                               VK_LValue, OK_Ordinary,
                                               SourceLocation());
       PE = new (Context) ParenExpr(OldRange.getBegin(),