diff options
author | Andrew Pinski <quic_apinski@quicinc.com> | 2024-02-21 20:12:21 -0800 |
---|---|---|
committer | Andrew Pinski <quic_apinski@quicinc.com> | 2024-02-22 09:28:39 -0800 |
commit | 1076ffda6ce5e6d5fc9577deaf8233e549e5787a (patch) | |
tree | 07b3e51ad2ff7d8c60a24afcce3e28eb4d4dd8f7 | |
parent | 7d8585c0c0e5934780281abdee256ae6553e56e8 (diff) | |
download | gcc-1076ffda6ce5e6d5fc9577deaf8233e549e5787a.zip gcc-1076ffda6ce5e6d5fc9577deaf8233e549e5787a.tar.gz gcc-1076ffda6ce5e6d5fc9577deaf8233e549e5787a.tar.bz2 |
warn-access: Fix handling of unnamed types [PR109804]
This looks like an oversight of handling DEMANGLE_COMPONENT_UNNAMED_TYPE.
DEMANGLE_COMPONENT_UNNAMED_TYPE only has the u.s_number.number set while
the code expected newc.u.s_binary.left would be valid.
So this treats DEMANGLE_COMPONENT_UNNAMED_TYPE like we treat function paramaters
(DEMANGLE_COMPONENT_FUNCTION_PARAM) and template paramaters (DEMANGLE_COMPONENT_TEMPLATE_PARAM).
Note the code in the demangler does this when it sets DEMANGLE_COMPONENT_UNNAMED_TYPE:
ret->type = DEMANGLE_COMPONENT_UNNAMED_TYPE;
ret->u.s_number.number = num;
Committed as obvious after bootstrap/test on x86_64-linux-gnu
PR tree-optimization/109804
gcc/ChangeLog:
* gimple-ssa-warn-access.cc (new_delete_mismatch_p): Handle
DEMANGLE_COMPONENT_UNNAMED_TYPE.
gcc/testsuite/ChangeLog:
* g++.dg/warn/Wmismatched-new-delete-8.C: New test.
Signed-off-by: Andrew Pinski <quic_apinski@quicinc.com>
-rw-r--r-- | gcc/gimple-ssa-warn-access.cc | 1 | ||||
-rw-r--r-- | gcc/testsuite/g++.dg/warn/Wmismatched-new-delete-8.C | 42 |
2 files changed, 43 insertions, 0 deletions
diff --git a/gcc/gimple-ssa-warn-access.cc b/gcc/gimple-ssa-warn-access.cc index cd083ab..dedaae2 100644 --- a/gcc/gimple-ssa-warn-access.cc +++ b/gcc/gimple-ssa-warn-access.cc @@ -1701,6 +1701,7 @@ new_delete_mismatch_p (const demangle_component &newc, case DEMANGLE_COMPONENT_FUNCTION_PARAM: case DEMANGLE_COMPONENT_TEMPLATE_PARAM: + case DEMANGLE_COMPONENT_UNNAMED_TYPE: return newc.u.s_number.number != delc.u.s_number.number; case DEMANGLE_COMPONENT_CHARACTER: diff --git a/gcc/testsuite/g++.dg/warn/Wmismatched-new-delete-8.C b/gcc/testsuite/g++.dg/warn/Wmismatched-new-delete-8.C new file mode 100644 index 0000000..0ddc056 --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/Wmismatched-new-delete-8.C @@ -0,0 +1,42 @@ +/* PR tree-optimization/109804 */ +/* { dg-do compile { target c++11 } } */ +/* { dg-options "-Wall" } */ + +/* Here we used to ICE in new_delete_mismatch_p because + we didn't handle unnamed types from the demangler (DEMANGLE_COMPONENT_UNNAMED_TYPE). */ + +template <typename T, typename ARGS> +static inline T * construct_at(void *at, ARGS && args) +{ + struct Placeable : T + { + Placeable(ARGS && args) : T(args) { } + void * operator new (long unsigned int, void *ptr) { return ptr; } + void operator delete (void *, void *) { } + }; + return new (at) Placeable(static_cast<ARGS &&>(args)); +} +template <typename MT> +struct Reconstructible +{ + char _space[sizeof(MT)]; + Reconstructible() { } +}; +template <typename MT> +struct Constructible : Reconstructible<MT> +{ + Constructible(){} +}; +struct A { }; +struct B +{ + Constructible<A> a { }; + B(int) { } +}; +Constructible<B> b { }; +void f() +{ + enum { ENUM_A = 1 }; + enum { ENUM_B = 1 }; + construct_at<B>(b._space, ENUM_B); +} |