Index: lib/AST/ASTContext.cpp
===================================================================
--- lib/AST/ASTContext.cpp	(revision 250827)
+++ lib/AST/ASTContext.cpp	(working copy)
@@ -5350,7 +5350,8 @@
   // same type.
   getObjCEncodingForTypeImpl(T, S, true, true, Field,
                              true /* outermost type */, false, false,
-                             false, false, false, NotEncodedT);
+                             false, true /* encode class names */,
+			     false, NotEncodedT);
 }
 
 void ASTContext::getObjCEncodingForPropertyType(QualType T,