Allow Objective-C pointer conversions following an explicit user conversion.

Finishes the work started in r194224, and fixes <rdar://problem/15494681>.

llvm-svn: 197609
diff --git a/clang/test/SemaObjCXX/contextual-convert-to-id.mm b/clang/test/SemaObjCXX/contextual-convert-to-id.mm
index 602d6c2..47a9d07 100644
--- a/clang/test/SemaObjCXX/contextual-convert-to-id.mm
+++ b/clang/test/SemaObjCXX/contextual-convert-to-id.mm
@@ -8,6 +8,10 @@
 - unknownMethod;
 @end
 
+@interface C : A
+- knownMethod;
+@end
+
 template<typename T> struct RetainPtr {
   explicit operator T*() const;
 };
@@ -17,6 +21,16 @@
   [a unknownMethod]; // expected-warning{{'A' may not respond to 'unknownMethod'}}
 }
 
+void explicitCast(RetainPtr<A> a, RetainPtr<B> b, RetainPtr<C> c) {
+  (void)(A*)a;
+  (void)(A*)b; // expected-error{{cannot convert 'RetainPtr<B>' to 'A *' without a conversion operator}}
+  (void)(A*)c;
+  (void)(C*)a;
+  (void)static_cast<A*>(a);
+  (void)static_cast<A*>(b);  // expected-error{{cannot convert 'RetainPtr<B>' to 'A *' without a conversion operator}}
+  (void)static_cast<A*>(c);
+}
+
 struct Incomplete; // expected-note{{forward declaration}}
 
 void methodCallToIncomplete(Incomplete &incomplete) {
@@ -31,3 +45,8 @@
   [a knownMethod];
   [a unknownMethod];
 }
+
+void explicitCast(IdPtr a) {
+  (void)(A*)a;
+  (void)static_cast<A*>(a);
+}