* obj-c++.dg/bitfield-[1-5].mm: New.

        * obj-c++.dg/class-protocol-1.mm: New.
        * obj-c++.dg/comp-types-1[0-1].mm: New.
        * obj-c++.dg/comp-types-[2-9].mm: New.
        * obj-c++.dg/encode-[4-8].mm: New.
        * obj-c++.dg/layout-1.mm: New.
        * obj-c++.dg/method-1[0-9].mm: New.
        * obj-c++.dg/method-2[0-1].mm: New.
        * obj-c++.dg/method-[8-9].mm: New.
        * obj-c++.dg/objc-gc-3.mm: New.
        * obj-c++.dg/try-catch-10.mm: New.
        * objc.dg/bitfield-5.m: New.
        * objc.dg/comp-types-10.m: New.
        * objc.dg/comp-types-9.m: New.
        * objc.dg/layout-1.m: New.
        * objc.dg/objc-gc-4.m: New.
        * objc.dg/try-catch-9.m: New.
        * objc.dg/class-protocol-1.m: Tweak diagnostics.
        * objc.dg/comp-types-1.m: Likewise.
        * objc.dg/comp-types-[5-6].m: Likewise.
        * objc.dg/method-9.m: Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@100121 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 14 insertions, 14 deletions

diff --git a/gcc/testsuite/objc.dg/class-protocol-1.m b/gcc/testsuite/objc.dg/class-protocol-1.m
index ffa2435f5c0..f97f2317962 100644
--- a/gcc/testsuite/objc.dg/class-protocol-1.m
+++ b/gcc/testsuite/objc.dg/class-protocol-1.m
@@ -313,9 +313,9 @@ testComptypes(void)
   { /* id <protocol>, SomeClass *  */
     mc1 == objP1;
     objP1 == mc1;
-    
-    mc1 == objP2; /* { dg-warning "does not implement" } */
-    objP2 == mc1; /* { dg-warning "does not implement" } */
+
+    mc1 == objP2; /* { dg-warning "lacks a cast" } */
+    objP2 == mc1; /* { dg-warning "lacks a cast" } */
   }
   { /* id <protocol>, id  */
     obj == objP1;
@@ -371,10 +371,10 @@ testComptypes(void)
     objP5 = objP1; /* { dg-warning "does not conform" } */
   }
   { /* id <protocol>, SomeClass *  */
-    mc1 = objP1; /* { dg-warning "incompatible" } */ /* FIXME: should be "" */
+    mc1 = objP1;
     objP1 = mc1;
-    
-    mc1 = objP2; /* { dg-warning "incompatible" } */ /* FIXME: should be "does not implement" */
+
+    mc1 = objP2; /* { dg-warning "does not conform" } */
     objP2 = mc1; /* { dg-warning "does not implement" } */
   }
   { /* id <protocol>, id  */
@@ -382,8 +382,8 @@ testComptypes(void)
     objP1 = obj;
   }
   { /* id <protocol>, Class  */
-    cls = objP1; /* { dg-warning "incompatible" } */
-    objP1 = cls; /* { dg-warning "incompatible" } */
+    cls = objP1; /* { dg-warning "distinct Objective\\-C type" } */
+    objP1 = cls; /* { dg-warning "distinct Objective\\-C type" } */
   }
   { /* id <protocol>, non-ObjC  */
     num = objP1; /* { dg-warning "makes integer" } */
@@ -401,11 +401,11 @@ testComptypes(void)
   }
   { /* Class <protocol>, SomeClass * */
     /* These combinations should always elicit a warning.  */
-    mc1 = clsP1; /* { dg-warning "incompatible" } */
-    clsP1 = mc1; /* { dg-warning "incompatible" } */
+    mc1 = clsP1; /* { dg-warning "distinct Objective\\-C type" } */
+    clsP1 = mc1; /* { dg-warning "distinct Objective\\-C type" } */
     
-    mc1 = clsP2; /* { dg-warning "incompatible" } */
-    clsP2 = mc1; /* { dg-warning "incompatible" } */
+    mc1 = clsP2; /* { dg-warning "distinct Objective\\-C type" } */
+    clsP2 = mc1; /* { dg-warning "distinct Objective\\-C type" } */
   }
   { /* Class <protocol>, id */
     obj = clsP1;
@@ -423,8 +423,8 @@ testComptypes(void)
     clsP1 = ptr;
   }
   { /* Class <protocol>, id <protocol> */
-    clsP1 = objP1; /* { dg-warning "incompatible" } */
-    objP1 = clsP1; /* { dg-warning "incompatible" } */
+    clsP1 = objP1; /* { dg-warning "distinct Objective\\-C type" } */
+    objP1 = clsP1; /* { dg-warning "distinct Objective\\-C type" } */
   }
 }