objc-act.c (get_super_receiver): If inside a class method of a category...

[gcc]
2002-08-26  Ziemowit Laski <zlaski@apple.com>

        * objc/objc-act.c (get_super_receiver): If inside a class method
        of a category, cast the receiver to 'id' before accessing the 'isa'
        field so that <objc/objc-class.h> is not needed.  For NeXT runtime.

[gcc/testsuite]
2002-08-26  Ziemowit Laski  <zlaski@apple.com>

        * objc.dg/super-class-2.m: New test.

From-SVN: r56587

gcc/ChangeLog

+2002-08-26  Ziemowit Laski <zlaski@apple.com>
+
+	* objc/objc-act.c (get_super_receiver): If inside a class method
+	of a category, cast the receiver to 'id' before accessing the 'isa'
+	field so that <objc/objc-class.h> is not needed.  For NeXT runtime.
+
 2002-08-26  Ulrich Weigand  <uweigand@de.ibm.com>
 
 	* config/s390/s390-protos.h (s390_function_prologue, 

gcc/objc/objc-act.c

@@ -7042,9 +7042,13 @@ get_super_receiver ()
 	    {
 	      super_class = get_class_reference (super_name);
 	      if (TREE_CODE (objc_method_context) == CLASS_METHOD_DECL)
+		/* Cast the super class to 'id', since the user may not have
+		   included <objc/objc-class.h>, leaving 'struct objc_class'
+		   an incomplete type.  */
 		super_class
-		  = build_component_ref (build_indirect_ref (super_class, "->"),
-					 get_identifier ("isa"));
+		  = build_component_ref (build_indirect_ref 
+					 (build_c_cast (id_type, super_class), "->"),
+					  get_identifier ("isa"));
 	    }
 	  else
 	    {

gcc/testsuite/ChangeLog

+2002-08-26  Ziemowit Laski  <zlaski@apple.com>
+
+        * objc.dg/super-class-2.m: New test.
+
 2002-08-24  Matt Austern  <austern@apple.com>
 
 	* g++.dg/ext/lvaddr.C: New test.

gcc/testsuite/objc.dg/super-class-2.m

+/* Test calling super from within a category class method.  */
+/* Author: Ziemowit Laski <zlaski@apple.com>  */
+/* { dg-do compile } */
+/* { dg-options "-fnext-runtime" } */
+
+typedef struct objc_object { struct objc_class *isa; } *id;
+
+@interface NSObject
++ (int) test_func0;
+@end
+@interface NSMenuItem: NSObject
++ (int) test_func0;
+@end
+
+@implementation NSObject
++ (int) test_func0
+{}
+@end
+
+@implementation NSMenuItem
++ (int) test_func0
+{
+  return [super test_func0];
+}
+@end
+
+@interface NSObject (Test)
++ (int) test_func;
+@end
+
+@implementation NSObject (Test)
++ (int) test_func
+{}
+@end
+
+@interface NSMenuItem (Test)
++ (int) test_func;
+@end
+
+@implementation NSMenuItem (Test)
++ (int) test_func
+{
+   return [super test_func];  /* { dg-bogus "dereferencing pointer to incomplete type" } */
+}
+@end