aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Polacek <polacek@redhat.com>2023-06-08 14:07:44 -0400
committerMarek Polacek <polacek@redhat.com>2023-06-28 11:51:59 -0400
commit4de22e25918f6fe40184c444ba6d81b19b806e26 (patch)
treecfa76a564a63d93bc1952479cce2adfeeb1afeb2
parent8719ab0d01d5a73767e34f88691c812db03e1449 (diff)
downloadgcc-4de22e25918f6fe40184c444ba6d81b19b806e26.zip
gcc-4de22e25918f6fe40184c444ba6d81b19b806e26.tar.gz
gcc-4de22e25918f6fe40184c444ba6d81b19b806e26.tar.bz2
c++: fix error reporting routines re-entered ICE [PR110175]
Here we get the "error reporting routines re-entered" ICE because of an unguarded use of warning_at. While at it, I added a check for a warning_at just above it. PR c++/110175 gcc/cp/ChangeLog: * typeck.cc (cp_build_unary_op): Check tf_warning before warning. gcc/testsuite/ChangeLog: * g++.dg/cpp0x/decltype-110175.C: New test.
-rw-r--r--gcc/cp/typeck.cc5
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/decltype-110175.C6
2 files changed, 9 insertions, 2 deletions
diff --git a/gcc/cp/typeck.cc b/gcc/cp/typeck.cc
index da591da..859b133 100644
--- a/gcc/cp/typeck.cc
+++ b/gcc/cp/typeck.cc
@@ -7561,7 +7561,8 @@ cp_build_unary_op (enum tree_code code, tree xarg, bool noconvert,
/* [depr.volatile.type] "Postfix ++ and -- expressions and
prefix ++ and -- expressions of volatile-qualified arithmetic
and pointer types are deprecated." */
- if (TREE_THIS_VOLATILE (arg) || CP_TYPE_VOLATILE_P (TREE_TYPE (arg)))
+ if ((TREE_THIS_VOLATILE (arg) || CP_TYPE_VOLATILE_P (TREE_TYPE (arg)))
+ && (complain & tf_warning))
warning_at (location, OPT_Wvolatile,
"%qs expression of %<volatile%>-qualified type is "
"deprecated",
@@ -7592,7 +7593,7 @@ cp_build_unary_op (enum tree_code code, tree xarg, bool noconvert,
return error_mark_node;
}
/* Otherwise, [depr.incr.bool] says this is deprecated. */
- else
+ else if (complain & tf_warning)
warning_at (location, OPT_Wdeprecated,
"use of an operand of type %qT "
"in %<operator++%> is deprecated",
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype-110175.C b/gcc/testsuite/g++.dg/cpp0x/decltype-110175.C
new file mode 100644
index 0000000..39643ca
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype-110175.C
@@ -0,0 +1,6 @@
+// PR c++/110175
+// { dg-do compile { target c++11 } }
+
+template<class T> auto f(T t) -> decltype(++t) { return t; } // { dg-warning "reference" "" { target c++14_down } }
+void f(...) {}
+void g() { f(true); }