Objective-C++ Sema. Fix a bug in instantiation of receivers.

Completes radar 7963410.

llvm-svn: 103719

3 files changed, 96 insertions, 5 deletions

diff --git a/clang/lib/Sema/SemaExprObjC.cpp b/clang/lib/Sema/SemaExprObjC.cpp
index 3853e911e72..eb60011ec3d 100644
--- a/clang/lib/Sema/SemaExprObjC.cpp
+++ b/clang/lib/Sema/SemaExprObjC.cpp
@@ -977,7 +977,12 @@ Sema::OwningExprResult Sema::BuildInstanceMessage(ExprArg ReceiverE,
                             CastExpr::CK_IntegralToPointer);
         ReceiverType = Receiver->getType();
       } 
-      else if (!PerformContextuallyConvertToObjCId(Receiver)) {
+      else if (getLangOptions().CPlusPlus &&
+               !PerformContextuallyConvertToObjCId(Receiver)) {
+        if (ImplicitCastExpr *ICE = dyn_cast<ImplicitCastExpr>(Receiver)) {
+          Receiver = ICE->getSubExpr();
+          ReceiverType = Receiver->getType();
+        }
         return BuildInstanceMessage(Owned(Receiver),
                                     ReceiverType,
                                     SuperLoc,
diff --git a/clang/test/SemaObjCXX/conversion-to-objc-pointer-2.mm b/clang/test/SemaObjCXX/conversion-to-objc-pointer-2.mm
new file mode 100644
index 00000000000..5277d101f58
--- /dev/null
+++ b/clang/test/SemaObjCXX/conversion-to-objc-pointer-2.mm
@@ -0,0 +1,87 @@
+// RUN: %clang_cc1 -fsyntax-only -verify %s
+// rdar: // 7963410
+
+@protocol NSObject @end
+@interface NSObject
+- (id)init;
+- (id) alloc;
+- (id) autorelease;
+@end
+
+template<class T>
+class TNSAutoRef
+{
+public:
+	TNSAutoRef(T t)
+		:	fRef(t)
+		{ }
+
+	~TNSAutoRef()
+		{ }
+
+	operator T() const
+		{ return fRef; }
+
+private:
+	T fRef;
+};
+
+
+#pragma mark -
+
+
+@protocol TFooProtocol <NSObject>
+
+- (void) foo;
+@end
+
+
+#pragma mark -
+
+
+@interface TFoo : NSObject
+
+- (void) setBlah: (id<TFooProtocol>)blah;
+@end
+
+
+#pragma mark -
+
+
+@implementation TFoo
+
+- (void) setBlah: (id<TFooProtocol>)blah
+	{ }
+@end
+
+
+#pragma mark -
+
+
+@interface TBar : NSObject
+
+- (void) setBlah: (id)blah;
+@end
+
+#pragma mark -
+
+
+@implementation TBar
+
+- (void) setBlah: (id)blah
+	{ }
+@end
+
+
+#pragma mark -
+
+
+int main (int argc, const char * argv[]) {
+
+	NSObject* object1 = [[[NSObject alloc] init] autorelease];
+	TNSAutoRef<NSObject*> object2([[NSObject alloc] init]);
+	TNSAutoRef<TBar*> bar([[TBar alloc] init]);
+	[bar setBlah: object1];				// <== Does not compile.  It should.
+	[bar setBlah: object2];				// <== Does not compile.  It should.
+	return 0;
+}
diff --git a/clang/test/SemaObjCXX/conversion-to-objc-pointer.mm b/clang/test/SemaObjCXX/conversion-to-objc-pointer.mm
index 2f146ce2061..235aaac8d09 100644
--- a/clang/test/SemaObjCXX/conversion-to-objc-pointer.mm
+++ b/clang/test/SemaObjCXX/conversion-to-objc-pointer.mm
@@ -28,20 +28,19 @@ private:
 @end
 
 @interface TFoo : NSObject
-
 - (void) foo;
 @end
 
 @implementation TFoo
-
-- (void) foo
-	{}
+- (void) foo {}
 @end
 
 @interface TBar : NSObject
+- (void) foo;
 @end
 
 @implementation TBar 
+- (void) foo {}
 @end
 
 int main () {