1 files changed, 5 insertions, 1 deletions
diff --git a/lib/Sema/SemaType.cpp b/lib/Sema/SemaType.cpp
index aa30b5c2da..06d8b3d4f6 100644
--- a/lib/Sema/SemaType.cpp
+++ b/lib/Sema/SemaType.cpp
@@ -1274,8 +1274,12 @@ TypeSourceInfo *Sema::GetTypeForDeclarator(Declarator &D, Scope *S,
               if (BTy->getKind() == BuiltinType::Float)
                 ArgTy = Context.DoubleTy;
             }
+          } else if (getLangOptions().ObjC1) {
+            if (ArgTy->isLegacyObjCIdType(Context))
+              ArgTy = Context.getObjCIdType();
+            else if (ArgTy->isLegacyObjCClassType(Context))
+              ArgTy = Context.getObjCClassType();
           }
-
           ArgTys.push_back(ArgTy);
         }