c-typeck.c (build_c_cast): In ObjC...

[gcc/ChangeLog]
2004-08-25  Ziemowit Laski  <zlaski@apple.com>

       * c-typeck.c (build_c_cast): In ObjC, always preserve (and silently
       accept) a cast from one Objective-C pointer type to another.

[gcc/testsuite/ChangeLog]
2004-08-25  Ziemowit Laski  <zlaski@apple.com>

       * objc.dg/proto-lossage-4.m: New test.

From-SVN: r86574

4 files changed, 64 insertions, 2 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 56ab52c..3ce3e7b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-25  Ziemowit Laski  <zlaski@apple.com>
+
+	* c-typeck.c (build_c_cast): In ObjC, always preserve (and silently
+	accept) a cast from one Objective-C pointer type to another.
+
 2004-08-25  Paolo Carlini  <pcarlini@suse.de>
 
 	* doc/install.texi: Document that libstdc++-v3 requires
diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c
index d71b990..ca6e9f3 100644
--- a/gcc/c-typeck.c
+++ b/gcc/c-typeck.c
@@ -2922,8 +2922,10 @@ build_c_cast (tree type, tree expr)
   /* The ObjC front-end uses TYPE_MAIN_VARIANT to tie together types differing
      only in <protocol> qualifications.  But when constructing cast expressions,
      the protocols do matter and must be kept around.  */
-  if (!c_dialect_objc () || !objc_is_object_ptr (type))
-    type = TYPE_MAIN_VARIANT (type);
+  if (objc_is_object_ptr (type) && objc_is_object_ptr (TREE_TYPE (expr)))
+    return build1 (NOP_EXPR, type, expr);
+
+  type = TYPE_MAIN_VARIANT (type);
 
   if (TREE_CODE (type) == ARRAY_TYPE)
     {
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0b6efa8..ec0349e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-25  Ziemowit Laski  <zlaski@apple.com>
+
+	* objc.dg/proto-lossage-4.m: New test.
+
 2004-08-25  Mark Mitchell  <mark@codesourcery.com>
 
 	PR c++/17155
diff --git a/gcc/testsuite/objc.dg/proto-lossage-4.m b/gcc/testsuite/objc.dg/proto-lossage-4.m
new file mode 100644
index 0000000..5bd25a4
--- /dev/null
+++ b/gcc/testsuite/objc.dg/proto-lossage-4.m
@@ -0,0 +1,51 @@
+/* Test for situations in which protocol conformance information
+   may be lost while casting.  */
+/* Author: Ziemowit Laski <zlaski@apple.com>.  */
+/* { dg-do compile } */
+
+/* One-line substitute for objc/objc.h */
+typedef struct objc_object { struct objc_class *class_pointer; } *id;
+
+@protocol Proto
+- (int)someValue;
+@end
+
+@interface Obj
+- (int)anotherValue;
+@end
+
+int foo(void) {
+  int receiver = 2;
+  Obj *objrcvr;
+  Obj <Proto> *objrcvr2;
+
+  receiver += [receiver someValue]; /* { dg-warning "invalid receiver type .int( )?." } */
+/* { dg-warning "Messages without a matching method signature" "" { target *-*-* } 22 } */
+/* { dg-warning "will be assumed to return .id. and accept" "" { target *-*-* } 22 } */
+/* { dg-warning ".\.\.\.. as arguments" "" { target *-*-* } 22 } */
+/* { dg-warning "assignment makes integer from pointer without a cast" "" { target *-*-* } 22 } */
+
+  receiver += [receiver anotherValue]; /* { dg-warning "invalid receiver type .int( )?." } */
+/* { dg-warning "assignment makes integer from pointer without a cast" "" { target *-*-* } 28 } */
+  
+  receiver += [(Obj *)receiver someValue]; /* { dg-warning ".Obj. may not respond to .\\-someValue." } */
+/* { dg-warning "assignment makes integer from pointer without a cast" "" { target *-*-* } 31 } */
+
+  receiver += [(Obj *)receiver anotherValue];
+  receiver += [(Obj <Proto> *)receiver someValue];
+  receiver += [(Obj <Proto> *)receiver anotherValue];
+  receiver += [objrcvr someValue]; /* { dg-warning ".Obj. may not respond to .\\-someValue." } */
+/* { dg-warning "assignment makes integer from pointer without a cast" "" { target *-*-* } 37 } */
+
+  receiver += [objrcvr anotherValue];
+  receiver += [(Obj <Proto> *)objrcvr someValue];
+  receiver += [(Obj <Proto> *)objrcvr anotherValue];
+  receiver += [objrcvr2 someValue];
+  receiver += [objrcvr2 anotherValue];
+  receiver += [(Obj *)objrcvr2 someValue]; /* { dg-warning ".Obj. may not respond to .\\-someValue." } */
+/* { dg-warning "assignment makes integer from pointer without a cast" "" { target *-*-* } 45 } */
+
+  receiver += [(Obj *)objrcvr2 anotherValue];
+
+  return receiver;
+}