diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
index cbbfe31..75c5888 100644
--- a/lib/AST/ASTContext.cpp
+++ b/lib/AST/ASTContext.cpp
@@ -1807,6 +1807,11 @@
   if (Ty->isObjCQualifiedIdType())
     return true;
   
+  // Blocks are objects.
+  if (Ty->isBlockPointerType())
+    return true;
+    
+  // All other object types are pointers.
   if (!Ty->isPointerType())
     return false;