diff options
author | Simon Martin <simon@nasilyan.com> | 2025-03-06 10:10:45 +0100 |
---|---|---|
committer | Simon Martin <simon@nasilyan.com> | 2025-03-06 10:11:26 +0100 |
commit | fdf846fdddcc0467b9f025757f081c5d54319d08 (patch) | |
tree | bd6a1982273dc811e090ee1ebee6bcb7e8d85ec4 /gcc | |
parent | 0aa9b079aec260b120b7c9fdba8c21066425c73d (diff) | |
download | gcc-fdf846fdddcc0467b9f025757f081c5d54319d08.zip gcc-fdf846fdddcc0467b9f025757f081c5d54319d08.tar.gz gcc-fdf846fdddcc0467b9f025757f081c5d54319d08.tar.bz2 |
c++: Don't replace INDIRECT_REFs by a const capture proxy too eagerly [PR117504]
We have been miscompiling the following valid code since GCC8, and
r8-3497-g281e6c1d8f1b4c
=== cut here ===
struct span {
span (const int (&__first)[1]) : _M_ptr (__first) {}
int operator[] (long __i) { return _M_ptr[__i]; }
const int *_M_ptr;
};
void foo () {
constexpr int a_vec[]{1};
auto vec{[&a_vec]() -> span { return a_vec; }()};
}
=== cut here ===
The problem is that perform_implicit_conversion_flags (via
mark_rvalue_use) replaces "a_vec" in the return statement by a
CONSTRUCTOR representing a_vec's constant value, and then takes its
address when invoking span's constructor. So we end up with an instance
that points to garbage instead of a_vec's storage.
As per Jason's suggestion, this patch simply removes the calls to
mark_*_use from perform_implicit_conversion_flags, which fixes the PR.
PR c++/117504
gcc/cp/ChangeLog:
* call.cc (perform_implicit_conversion_flags): Don't call
mark_{l,r}value_use.
gcc/testsuite/ChangeLog:
* g++.dg/cpp2a/constexpr-117504.C: New test.
* g++.dg/cpp2a/constexpr-117504a.C: New test.
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/cp/call.cc | 5 | ||||
-rw-r--r-- | gcc/testsuite/g++.dg/cpp2a/constexpr-117504.C | 60 | ||||
-rw-r--r-- | gcc/testsuite/g++.dg/cpp2a/constexpr-117504a.C | 12 |
3 files changed, 72 insertions, 5 deletions
diff --git a/gcc/cp/call.cc b/gcc/cp/call.cc index f7b4ccc..c1c8987 100644 --- a/gcc/cp/call.cc +++ b/gcc/cp/call.cc @@ -13971,11 +13971,6 @@ perform_implicit_conversion_flags (tree type, tree expr, conversion *conv; location_t loc = cp_expr_loc_or_input_loc (expr); - if (TYPE_REF_P (type)) - expr = mark_lvalue_use (expr); - else - expr = mark_rvalue_use (expr); - if (error_operand_p (expr)) return error_mark_node; diff --git a/gcc/testsuite/g++.dg/cpp2a/constexpr-117504.C b/gcc/testsuite/g++.dg/cpp2a/constexpr-117504.C new file mode 100644 index 0000000..290d3df --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/constexpr-117504.C @@ -0,0 +1,60 @@ +// PR c++/117504 - Initial report +// { dg-do "run" { target c++20 } } + +struct span { + span (const int (&__first)[1]) : _M_ptr (__first) {} + int operator[] (long __i) { return _M_ptr[__i]; } + const int *_M_ptr; +}; + +constexpr int a_global_vec[]{1}; +span myFunctor() { + return a_global_vec; +} + +int main() { + constexpr int a_vec[]{1}; + + // + // This PR's case, that used to be miscompiled. + // + auto lambda_1 = [&a_vec] () -> span { return a_vec; }; + auto vec_1 { lambda_1 () }; + if (vec_1[0] != 1) + __builtin_abort (); + + // Variant that used to be miscompiled as well. + auto lambda_2 = [&] () -> span { return a_vec; }; + auto vec_2 { lambda_2 () }; + if (vec_2[0] != 1) + __builtin_abort (); + + // + // Related cases that worked already. + // + auto lambda_3 = [&a_vec] () /* -> span */ { return a_vec; }; + auto vec_3 { lambda_3 () }; + if (vec_3[0] != 1) + __builtin_abort (); + + auto lambda_4 = [&] () /* -> span */ { return a_vec; }; + auto vec_4 { lambda_4 () }; + if (vec_4[0] != 1) + __builtin_abort (); + + const int (&vec_5)[1] = a_vec; + if (vec_5[0] != 1) + __builtin_abort (); + + span vec_6 (a_vec); + if (vec_6[0] != 1) + __builtin_abort (); + + auto vec_7 = myFunctor (); + if (vec_7[0] != 1) + __builtin_abort (); + + const int (&vec_8)[1] { a_vec }; + if (vec_8[0] != 1) + __builtin_abort (); +} diff --git a/gcc/testsuite/g++.dg/cpp2a/constexpr-117504a.C b/gcc/testsuite/g++.dg/cpp2a/constexpr-117504a.C new file mode 100644 index 0000000..f6d4dc8 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/constexpr-117504a.C @@ -0,0 +1,12 @@ +// PR c++/117504 - ICE discovered by ppalka@ when reducing. +// { dg-do "compile" { target c++20 } } + +struct span { + span (const int* __first) : _M_ptr (__first) {} + int operator[] (long __i) { return _M_ptr[__i]; } + const int *_M_ptr; +}; +int main() { + constexpr int a_vec[]{1}; + auto vec { [&a_vec]() -> span { return a_vec; } () }; +} |