public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Andrew Pinski <pinskia@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r14-9138] warn-access: Fix handling of unnamed types [PR109804]
Date: Thu, 22 Feb 2024 17:29:36 +0000 (GMT)	[thread overview]
Message-ID: <20240222172936.AD51D3858419@sourceware.org> (raw)

https://gcc.gnu.org/g:1076ffda6ce5e6d5fc9577deaf8233e549e5787a

commit r14-9138-g1076ffda6ce5e6d5fc9577deaf8233e549e5787a
Author: Andrew Pinski <quic_apinski@quicinc.com>
Date:   Wed Feb 21 20:12:21 2024 -0800

    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>

Diff:
---
 gcc/gimple-ssa-warn-access.cc                      |  1 +
 .../g++.dg/warn/Wmismatched-new-delete-8.C         | 42 ++++++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/gcc/gimple-ssa-warn-access.cc b/gcc/gimple-ssa-warn-access.cc
index cd083ab22377..dedaae27b31c 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 000000000000..0ddc056c6df2
--- /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);
+}

                 reply	other threads:[~2024-02-22 17:29 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240222172936.AD51D3858419@sourceware.org \
    --to=pinskia@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).