Allow static_cast to objective-c pointers.

Fixes radar 7952457.

llvm-svn: 103447

2 files changed, 18 insertions, 2 deletions

diff --git a/clang/lib/Sema/SemaCXXCast.cpp b/clang/lib/Sema/SemaCXXCast.cpp
index ba7e1ff6341..b7b6c3535c5 100644
--- a/clang/lib/Sema/SemaCXXCast.cpp
+++ b/clang/lib/Sema/SemaCXXCast.cpp
@@ -578,8 +578,9 @@ static TryCastResult TryStaticCast(Sema &Self, Expr *&SrcExpr,
           return TC_Success;
         }
       }
-      else if (CStyle && DestType->isObjCObjectPointerType()) {
-        // allow c-style cast of objective-c pointers as they are pervasive.
+      else if (DestType->isObjCObjectPointerType()) {
+        // allow both c-style cast and static_cast of objective-c pointers as 
+        // they are pervasive.
         Kind = CastExpr::CK_AnyPointerToObjCPointerCast;
         return TC_Success;
       }
diff --git a/clang/test/SemaObjCXX/void_to_obj.mm b/clang/test/SemaObjCXX/void_to_obj.mm
index 52510c84f13..7dca9faa854 100644
--- a/clang/test/SemaObjCXX/void_to_obj.mm
+++ b/clang/test/SemaObjCXX/void_to_obj.mm
@@ -9,3 +9,18 @@ void func() {
 
   obj = vv; // expected-error{{assigning to 'XX *' from incompatible type 'void *'}}
 }
+
+// <rdar://problem/7952457>
+@interface I
+{
+  void* delegate;
+}
+- (I*) Meth;
+- (I*) Meth1;
+@end
+
+@implementation I 
+- (I*) Meth { return static_cast<I*>(delegate); }
+- (I*) Meth1 { return reinterpret_cast<I*>(delegate); }
+@end
+