exceptions-3.mm: Remove check for message no longer emitted.

* obj-c++.dg/exceptions-3.mm: Remove check for message no longer
emitted.
* obj-c++.dg/exceptions-5.mm: Likewise.

From-SVN: r210464

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d60f6b34952520285b7e877be8c397bc29e637c4..776a4165cda80ee8b88f5d1e2ddce27eae2ce0b6 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -27,7 +27,7 @@
        (add_function_candidate): Pass actual argument, rather than type, to
        bad_arg_conversion_rejection.
        (print_conversion_rejection): Explain what's wrong with the conversion.
-       (print_z_candidate): Say "candidate:" before each candidate.
+       (print_z_candidates): Say "candidate:" before each candidate.
        (splice_viable): Be strict if we see a viable or template candidate.
        (build_user_type_conversion_1): Pass false to strict parameter.
        (perform_overload_resolution, build_conditional_expr_1): Likewise.

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7df284eb6bd08fc1816ce72e3431efcee11a5945..0146e0cb9cf07047733f36d17fdea35abca7588a 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2014-05-15  Andreas Schwab  <schwab@suse.de>
+
+       * obj-c++.dg/exceptions-3.mm: Remove check for message no longer
+       emitted.
+       * obj-c++.dg/exceptions-5.mm: Likewise.
+
 2014-05-15  Zhenqiang Chen  <zhenqiang.chen@linaro.org>
 
        * shrink-wrap-loop.c: New test case.
@@ -41,12 +47,12 @@
 2014-05-14  Andrey Belevantsev  <abel@ispras.ru>
 
        PR rtl-optimization/60866
-       * gcc.dg/pr60866.c: New test. 
+       * gcc.dg/pr60866.c: New test.
 
 2014-05-14  Andrey Belevantsev  <abel@ispras.ru>
 
        PR rtl-optimization/60901
-       * gcc.target/i386/pr60901.c: New test. 
+       * gcc.target/i386/pr60901.c: New test.
 
 2014-05-14  Yury Gribov  <y.gribov@samsung.com>
 

diff --git a/gcc/testsuite/obj-c++.dg/exceptions-3.mm b/gcc/testsuite/obj-c++.dg/exceptions-3.mm
index bf0be018e0307d14d5858838efbe0cc0bea0d879..3e6a77513adaa63b944c5b0d100d06df9d4414ca 100644 (file)
--- a/gcc/testsuite/obj-c++.dg/exceptions-3.mm
+++ b/gcc/testsuite/obj-c++.dg/exceptions-3.mm
@@ -73,7 +73,6 @@ int test (id object)
     {                     /* { dg-error "no matching function" "" { target *-*-* } 72 } */
       dummy++;            /* { dg-message "MyObject" "" { target *-*-* } 13 } */
     }                     /* { dg-message "candidate" "" { target *-*-* } 13 } */
-                          /* { dg-message "candidates" "" { target *-*-* } 72 } */
   @try { @throw object; }
   @catch (static MyObject *x) /* { dg-error "storage class" } */
     {

diff --git a/gcc/testsuite/obj-c++.dg/exceptions-5.mm b/gcc/testsuite/obj-c++.dg/exceptions-5.mm
index 1ea9a6f4610ec09f6d8cfbf8cb8733aa860434a3..087533bcbbbfd25992e91c7a16438831291ba1f8 100644 (file)
--- a/gcc/testsuite/obj-c++.dg/exceptions-5.mm
+++ b/gcc/testsuite/obj-c++.dg/exceptions-5.mm
@@ -73,7 +73,6 @@ int test (id object)
     {                     /* { dg-error "no matching function" "" { target *-*-* } 72 } */
       dummy++;            /* { dg-message "MyObject" "" { target *-*-* } 13 } */
     }                     /* { dg-message "candidate" "" { target *-*-* } 13 } */
-                          /* { dg-message "candidate" "" { target *-*-* } 72 } */
 
   @try { @throw object; }
   @catch (static MyObject *) /* { dg-error "storage class" } */