From: "Kewen.Lin" <linkw@linux.ibm.com>
To: GCC Patches <gcc-patches@gcc.gnu.org>
Cc: Richard Biener <richard.guenther@gmail.com>,
Segher Boessenkool <segher@kernel.crashing.org>,
Peter Bergner <bergner@linux.ibm.com>
Subject: [PATCH] Handle OPAQUE_TYPE specially in verify_type [PR106833]
Date: Thu, 8 Sep 2022 13:53:33 +0800 [thread overview]
Message-ID: <adbbc237-ef38-07c5-060f-72afdfabb8aa@linux.ibm.com> (raw)
Hi,
As PR106833 shows, cv-qualified opaque type can cause ICE
during LTO. It exposes that we missd to handle OPAQUE_TYPE
well in type verification. As Richi pointed out, also
assuming that target will always define TYPE_MAIN_VARIANT
and TYPE_CANONICAL for opaque type, this patch is to check
both are OPAQUE_TYPE_P. Besides, it also checks the only
available size and alignment information as well as type
mode for TYPE_MAIN_VARIANT.
Bootstrapped and regtested on powerpc64-linux-gnu P7 and
powerpc64le-linux-gnu P9 and P10.
Is it ok for trunk?
BR,
Kewen
-----
PR middle-end/106833
gcc/ChangeLog:
* tree.cc (verify_opaque_type): New function.
(verify_match): New macro.
(verify_type): Call verify_opaque_type for OPAQUE_TYPE.
gcc/testsuite/ChangeLog:
* gcc.target/powerpc/pr106833.c: New test.
---
gcc/testsuite/gcc.target/powerpc/pr106833.c | 14 +++++++
gcc/tree.cc | 45 ++++++++++++++++++++-
2 files changed, 58 insertions(+), 1 deletion(-)
create mode 100644 gcc/testsuite/gcc.target/powerpc/pr106833.c
diff --git a/gcc/testsuite/gcc.target/powerpc/pr106833.c b/gcc/testsuite/gcc.target/powerpc/pr106833.c
new file mode 100644
index 00000000000..968d75184ff
--- /dev/null
+++ b/gcc/testsuite/gcc.target/powerpc/pr106833.c
@@ -0,0 +1,14 @@
+/* { dg-do link } */
+/* { dg-require-effective-target power10_ok } */
+/* { dg-require-effective-target lto } */
+/* { dg-options "-flto -mdejagnu-cpu=power10" } */
+
+/* Verify there is no ICE in LTO mode. */
+
+int main ()
+{
+ float *b;
+ const __vector_quad c;
+ __builtin_mma_disassemble_acc (b, &c);
+ return 0;
+}
diff --git a/gcc/tree.cc b/gcc/tree.cc
index fed1434d141..e67caa8f85d 100644
--- a/gcc/tree.cc
+++ b/gcc/tree.cc
@@ -13670,6 +13670,42 @@ gimple_canonical_types_compatible_p (const_tree t1, const_tree t2,
}
}
+/* For OPAQUE_TYPE T, it has only size and alignment information, so verify
+ these properties of T match TV which is the main variant of T. Also
+ verify the type of TC, which is the canonical of T, is OPAQUE_TYPE. */
+
+static void
+verify_opaque_type (const_tree t, tree tv, tree tc)
+{
+ gcc_assert (OPAQUE_TYPE_P (t));
+ gcc_assert (tv && tv == TYPE_MAIN_VARIANT (tv));
+ gcc_assert (tc && tc == TYPE_CANONICAL (tc));
+
+#define verify_match(flag, t, tv) \
+ do \
+ { \
+ if (flag (t) != flag (tv)) \
+ { \
+ error ("opaque type differs by %s", #flag); \
+ debug_tree (tv); \
+ } \
+ } \
+ while (false)
+
+ if (t != tv)
+ {
+ verify_match (TREE_CODE, t, tv);
+ verify_match (TYPE_MODE, t, tv);
+ verify_match (TYPE_SIZE, t, tv);
+ verify_match (TYPE_ALIGN, t, tv);
+ verify_match (TYPE_USER_ALIGN, t, tv);
+ }
+
+ if (t != tc)
+ verify_match (TREE_CODE, t, tc);
+#undef verify_match
+}
+
/* Verify type T. */
void
@@ -13677,6 +13713,14 @@ verify_type (const_tree t)
{
bool error_found = false;
tree mv = TYPE_MAIN_VARIANT (t);
+ tree ct = TYPE_CANONICAL (t);
+
+ if (OPAQUE_TYPE_P (t))
+ {
+ verify_opaque_type (t, mv, ct);
+ return;
+ }
+
if (!mv)
{
error ("main variant is not defined");
@@ -13691,7 +13735,6 @@ verify_type (const_tree t)
else if (t != mv && !verify_type_variant (t, mv))
error_found = true;
- tree ct = TYPE_CANONICAL (t);
if (!ct)
;
else if (TYPE_CANONICAL (ct) != ct)
--
2.27.0
next reply other threads:[~2022-09-08 5:53 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-08 5:53 Kewen.Lin [this message]
2022-09-08 7:36 ` Richard Biener
2022-09-09 6:51 ` [PATCH v2] " Kewen.Lin
2022-09-09 7:25 ` Richard Biener
2022-09-09 13:27 ` Kewen.Lin
2022-09-10 0:56 ` Peter Bergner
2022-09-10 1:47 ` Segher Boessenkool
2022-09-10 3:16 ` Peter Bergner
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=adbbc237-ef38-07c5-060f-72afdfabb8aa@linux.ibm.com \
--to=linkw@linux.ibm.com \
--cc=bergner@linux.ibm.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=richard.guenther@gmail.com \
--cc=segher@kernel.crashing.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).