aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Palka <ppalka@redhat.com>2023-12-08 13:33:55 -0500
committerPatrick Palka <ppalka@redhat.com>2023-12-08 13:33:55 -0500
commit5764825aed613f201a8bc47e5b239027a39691f0 (patch)
tree654cb27057815c9593aab71e627f984f4dc2a91d
parentd468718c9a097aeb8794fb1a2df6db2c1064d7f7 (diff)
downloadgcc-5764825aed613f201a8bc47e5b239027a39691f0.zip
gcc-5764825aed613f201a8bc47e5b239027a39691f0.tar.gz
gcc-5764825aed613f201a8bc47e5b239027a39691f0.tar.bz2
c++: undiagnosed error_mark_node from cp_build_c_cast [PR112658]
When cp_build_c_cast commits to an erroneous const_cast, we neglect to replay errors from build_const_cast_1 which can lead to us incorrectly accepting (and "miscompiling") the cast, or triggering the assert in finish_expr_stmt. This patch fixes this oversight. This was the original fix for the ICE in PR112658 before r14-5941-g305a2686c99bf9 made us accept the testcase there after all. I wasn't able to come up with an alternate testcase for which this fix has an effect anymore, but below is a reduced version of the PR112658 testcase (accepted ever since r14-5941) for good measure. PR c++/112658 PR c++/94264 gcc/cp/ChangeLog: * typeck.cc (cp_build_c_cast): If we're committed to a const_cast and the result is erroneous, call build_const_cast_1 a second time to issue errors. Use complain=tf_none instead of =false. gcc/testsuite/ChangeLog: * g++.dg/cpp0x/initlist-array20.C: New test.
-rw-r--r--gcc/cp/typeck.cc4
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/initlist-array20.C11
2 files changed, 14 insertions, 1 deletions
diff --git a/gcc/cp/typeck.cc b/gcc/cp/typeck.cc
index 8e4cfae..258cfd4 100644
--- a/gcc/cp/typeck.cc
+++ b/gcc/cp/typeck.cc
@@ -9213,6 +9213,8 @@ cp_build_c_cast (location_t loc, tree type, tree expr,
maybe_warn_about_useless_cast (loc, type, value, complain);
maybe_warn_about_cast_ignoring_quals (loc, type, complain);
}
+ else if (complain & tf_error)
+ build_const_cast_1 (loc, type, value, tf_error, &valid_p);
return result;
}
@@ -9248,7 +9250,7 @@ cp_build_c_cast (location_t loc, tree type, tree expr,
to succeed. */
if (!same_type_p (non_reference (type), non_reference (result_type)))
{
- result = build_const_cast_1 (loc, type, result, false, &valid_p);
+ result = build_const_cast_1 (loc, type, result, tf_none, &valid_p);
gcc_assert (valid_p);
}
return result;
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist-array20.C b/gcc/testsuite/g++.dg/cpp0x/initlist-array20.C
new file mode 100644
index 0000000..048c5b4
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist-array20.C
@@ -0,0 +1,11 @@
+// PR c++/112658
+// PR c++/94264
+// { dg-do compile { target c++11 } }
+
+void f(int*);
+
+int main() {
+ using array = int[];
+ f(array{42});
+ f((int*)array{42});
+}