aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Carlini <paolo.carlini@oracle.com>2019-03-21 01:03:30 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2019-03-21 01:03:30 +0000
commitc6ecc13a07cae1131fdbb91e465269402e4b0323 (patch)
treeea82bb7405df6b0b328fa6448297b5fdfa424091
parent2aecb44b403c8eed36c3d150cb5b4ebb970686b1 (diff)
downloadgcc-c6ecc13a07cae1131fdbb91e465269402e4b0323.zip
gcc-c6ecc13a07cae1131fdbb91e465269402e4b0323.tar.gz
gcc-c6ecc13a07cae1131fdbb91e465269402e4b0323.tar.bz2
re PR c++/89571 (ICE in nothrow_spec_p, at cp/except.c:1238)
/cp 2019-03-21 Paolo Carlini <paolo.carlini@oracle.com> PR c++/89571 * method.c (after_nsdmi_defaulted_late_checks): Avoid passing error_mark_node to comp_except_specs. /testsuite 2019-03-21 Paolo Carlini <paolo.carlini@oracle.com> PR c++/89571 * g++.dg/cpp0x/noexcept37.C: New. From-SVN: r269832
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/method.c3
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/noexcept37.C8
4 files changed, 22 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 09fb3f2..5a28c96 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2019-03-21 Paolo Carlini <paolo.carlini@oracle.com>
+
+ PR c++/89571
+ * method.c (after_nsdmi_defaulted_late_checks): Avoid passing
+ error_mark_node to comp_except_specs.
+
2019-03-20 Jason Merrill <jason@redhat.com>
PR c++/87480 - decltype of member access in default template arg
diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index 477d3271..da9600c 100644
--- a/gcc/cp/method.c
+++ b/gcc/cp/method.c
@@ -2274,6 +2274,9 @@ after_nsdmi_defaulted_late_checks (tree t)
continue;
tree eh_spec = get_defaulted_eh_spec (fn);
+ if (eh_spec == error_mark_node)
+ continue;
+
if (!comp_except_specs (TYPE_RAISES_EXCEPTIONS (TREE_TYPE (fn)),
eh_spec, ce_normal))
DECL_DELETED_FN (fn) = true;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7487e91..12fdbd0 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-03-21 Paolo Carlini <paolo.carlini@oracle.com>
+
+ PR c++/89571
+ * g++.dg/cpp0x/noexcept37.C: New.
+
2019-03-21 Iain Buclaw <ibuclaw@gdcproject.org>
PR d/89017
diff --git a/gcc/testsuite/g++.dg/cpp0x/noexcept37.C b/gcc/testsuite/g++.dg/cpp0x/noexcept37.C
new file mode 100644
index 0000000..93dfecb
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/noexcept37.C
@@ -0,0 +1,8 @@
+// PR c++/89571
+// { dg-do compile { target c++11 } }
+
+struct A
+{
+ int i = ; // { dg-error "expected" }
+ A() noexcept = default;
+};