aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@gcc.gnu.org>2014-05-15 09:34:27 +0000
committerAndreas Schwab <schwab@gcc.gnu.org>2014-05-15 09:34:27 +0000
commitc4622c2bed1f740f996ca7f2ed5300a4d14da143 (patch)
tree73fb1bb24df66de35f9d5e491d1cdc7463167d12
parenta2e6c10cbd7ff6f51052d5a550b4bf999189aa31 (diff)
downloadgcc-c4622c2bed1f740f996ca7f2ed5300a4d14da143.zip
gcc-c4622c2bed1f740f996ca7f2ed5300a4d14da143.tar.gz
gcc-c4622c2bed1f740f996ca7f2ed5300a4d14da143.tar.bz2
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
-rw-r--r--gcc/cp/ChangeLog2
-rw-r--r--gcc/testsuite/ChangeLog10
-rw-r--r--gcc/testsuite/obj-c++.dg/exceptions-3.mm1
-rw-r--r--gcc/testsuite/obj-c++.dg/exceptions-5.mm1
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 <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 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" } */