From 3e9481da3fbca87b1f5b167690381ed130a6db11 Mon Sep 17 00:00:00 2001 From: schwab Date: Thu, 15 May 2014 09:34:27 +0000 Subject: [PATCH] * obj-c++.dg/exceptions-3.mm: Remove check for message no longer emitted. * obj-c++.dg/exceptions-5.mm: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@210464 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog | 2 +- gcc/testsuite/ChangeLog | 10 ++++++++-- gcc/testsuite/obj-c++.dg/exceptions-3.mm | 1 - gcc/testsuite/obj-c++.dg/exceptions-5.mm | 1 - 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index d60f6b3..776a416 100644 --- 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 7df284e..0146e0c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2014-05-15 Andreas Schwab + + * 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 * shrink-wrap-loop.c: New test case. @@ -41,12 +47,12 @@ 2014-05-14 Andrey Belevantsev PR rtl-optimization/60866 - * gcc.dg/pr60866.c: New test. + * gcc.dg/pr60866.c: New test. 2014-05-14 Andrey Belevantsev PR rtl-optimization/60901 - * gcc.target/i386/pr60901.c: New test. + * gcc.target/i386/pr60901.c: New test. 2014-05-14 Yury Gribov diff --git a/gcc/testsuite/obj-c++.dg/exceptions-3.mm b/gcc/testsuite/obj-c++.dg/exceptions-3.mm index bf0be01..3e6a775 100644 --- 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 1ea9a6f..087533b 100644 --- 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" } */ -- 2.7.4