3 files changed, 3 insertions, 3 deletions
diff --git a/lib/CodeGen/CGBlocks.h b/lib/CodeGen/CGBlocks.h
index 05d66de3f9..5a0af04b24 100644
--- a/lib/CodeGen/CGBlocks.h
+++ b/lib/CodeGen/CGBlocks.h
@@ -223,7 +223,7 @@ public:
       return true;
     if (getContext().isObjCNSObjectType(Ty))
       return true;
-    if (getContext().isObjCObjectPointerType(Ty))
+    if (Ty->isObjCObjectPointerType())
       return true;
     return false;
   }
diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp
index 377834d247..346b6703d3 100644
--- a/lib/CodeGen/CGExpr.cpp
+++ b/lib/CodeGen/CGExpr.cpp
@@ -1070,7 +1070,7 @@ LValue CodeGenFunction::EmitLValueForField(llvm::Value* BaseValue,
       if (attr == QualType::Weak)
         attr = QualType::GCNone;
     }
-    else if (getContext().isObjCObjectPointerType(Ty))
+    else if (Ty->isObjCObjectPointerType())
       attr = QualType::Strong;
   }
   LValue LV =  
diff --git a/lib/CodeGen/CGObjCMac.cpp b/lib/CodeGen/CGObjCMac.cpp
index 70eb6a70e1..661f75a057 100644
--- a/lib/CodeGen/CGObjCMac.cpp
+++ b/lib/CodeGen/CGObjCMac.cpp
@@ -3005,7 +3005,7 @@ static QualType::GCAttrTypes GetGCAttrTypeForType(ASTContext &Ctx,
   if (FQT.isObjCGCWeak())
     return QualType::Weak;
 
-  if (Ctx.isObjCObjectPointerType(FQT))
+  if (FQT->isObjCObjectPointerType())
     return QualType::Strong;
 
   if (const PointerType *PT = FQT->getAsPointerType())