From: Tom de Vries <Tom_deVries@mentor.com>
To: Joseph Myers <joseph@codesourcery.com>
Cc: Jason Merrill <jason@redhat.com>, GCC Patches <gcc-patches@gcc.gnu.org>
Subject: Re: [PATCH, PR71602, 4/4] Make canonical_va_list_type more strict
Date: Mon, 29 Aug 2016 16:12:00 -0000 [thread overview]
Message-ID: <61d0854f-16be-8bd6-a776-e9d51dd00739@mentor.com> (raw)
In-Reply-To: <alpine.DEB.2.20.1608291551010.6854@digraph.polyomino.org.uk>
[-- Attachment #1: Type: text/plain, Size: 290 bytes --]
On 29/08/16 17:51, Joseph Myers wrote:
> On Wed, 24 Aug 2016, Tom de Vries wrote:
>
>> This patch fixes PR71602 by making canonical_va_list_type more strict.
>>
>> Bootstrapped and reg-tested on x86_64.
>>
>> OK for trunk, 6-branch?
>
> ENOPATCH
>
Patch attached this time.
Thanks,
- Tom
[-- Attachment #2: 0004-Make-canonical_va_list_type-more-strict.patch --]
[-- Type: text/x-patch, Size: 3842 bytes --]
Make canonical_va_list_type more strict
2016-08-22 Tom de Vries <tom@codesourcery.com>
PR C/71602
* builtins.c (std_canonical_va_list_type): Strictly return non-null for
va_list type only.
* config/i386/i386.c (ix86_canonical_va_list_type): Same.
* gimplify.c (gimplify_va_arg_expr): Handle &va_list.
* c-common.c (build_va_arg): Handle more strict
targetm.canonical_va_list_type.
* c-c++-common/va-arg-va-list-type.c: New test.
---
gcc/builtins.c | 4 ----
gcc/c-family/c-common.c | 8 ++------
gcc/config/i386/i386.c | 8 --------
gcc/gimplify.c | 5 +++++
gcc/testsuite/c-c++-common/va-arg-va-list-type.c | 9 +++++++++
5 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/gcc/builtins.c b/gcc/builtins.c
index abc934b..101b1e3 100644
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -4089,10 +4089,6 @@ std_canonical_va_list_type (tree type)
{
tree wtype, htype;
- if (INDIRECT_REF_P (type))
- type = TREE_TYPE (type);
- else if (POINTER_TYPE_P (type) && POINTER_TYPE_P (TREE_TYPE (type)))
- type = TREE_TYPE (type);
wtype = va_list_type_node;
htype = type;
/* Treat structure va_list types. */
diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c
index 3b61e64..6cf2ffc 100644
--- a/gcc/c-family/c-common.c
+++ b/gcc/c-family/c-common.c
@@ -5813,15 +5813,11 @@ build_va_arg (location_t loc, tree expr, tree type)
{
/* Case 1: Not an array type. */
- /* Take the address, to get '&ap'. */
+ /* Take the address, to get '&ap'. Note that &ap is not a va_list
+ type. */
mark_addressable (expr);
expr = build1 (ADDR_EXPR, build_pointer_type (TREE_TYPE (expr)), expr);
- /* Verify that &ap is still recognized as having va_list type. */
- tree canon_expr_type
- = targetm.canonical_va_list_type (TREE_TYPE (expr));
- gcc_assert (canon_expr_type != NULL_TREE);
-
return build_va_arg_1 (loc, type, expr);
}
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 2639c8c..343efa0 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -48565,14 +48565,6 @@ ix86_canonical_va_list_type (tree type)
{
tree wtype, htype;
- /* Resolve references and pointers to va_list type. */
- if (TREE_CODE (type) == MEM_REF)
- type = TREE_TYPE (type);
- else if (POINTER_TYPE_P (type) && POINTER_TYPE_P (TREE_TYPE(type)))
- type = TREE_TYPE (type);
- else if (POINTER_TYPE_P (type) && TREE_CODE (TREE_TYPE (type)) == ARRAY_TYPE)
- type = TREE_TYPE (type);
-
if (TARGET_64BIT && va_list_type_node != NULL_TREE)
{
wtype = va_list_type_node;
diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index 288b472..6ce516a 100644
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -11959,6 +11959,11 @@ gimplify_va_arg_expr (tree *expr_p, gimple_seq *pre_p,
if (have_va_type == error_mark_node)
return GS_ERROR;
have_va_type = targetm.canonical_va_list_type (have_va_type);
+ if (have_va_type == NULL_TREE
+ && TREE_CODE (valist) == ADDR_EXPR)
+ /* Handle 'Case 1: Not an array type' from c-common.c/build_va_arg. */
+ have_va_type
+ = targetm.canonical_va_list_type (TREE_TYPE (TREE_TYPE (valist)));
gcc_assert (have_va_type != NULL_TREE);
/* Generate a diagnostic for requesting data of a type that cannot
diff --git a/gcc/testsuite/c-c++-common/va-arg-va-list-type.c b/gcc/testsuite/c-c++-common/va-arg-va-list-type.c
new file mode 100644
index 0000000..cdd97cf
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/va-arg-va-list-type.c
@@ -0,0 +1,9 @@
+/* { dg-do compile } */
+
+__builtin_va_list *pap;
+
+void
+fn1 (void)
+{
+ __builtin_va_arg (pap, double); /* { dg-error "first argument to 'va_arg' not of type 'va_list'" } */
+}
next prev parent reply other threads:[~2016-08-29 16:12 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-23 10:27 [PATCH, PR71602] Give error for invalid va_list argument to va_arg Tom de Vries
2016-06-23 21:22 ` Jason Merrill
2016-08-24 6:22 ` [PATCH, PR71602, 4/4] Make canonical_va_list_type more strict Tom de Vries
2016-08-29 15:51 ` Joseph Myers
2016-08-29 16:12 ` Tom de Vries [this message]
2016-09-09 22:12 ` Jeff Law
2016-09-11 9:39 ` Christophe Lyon
2016-09-19 11:20 ` Szabolcs Nagy
2016-09-19 11:25 ` Tom de Vries
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=61d0854f-16be-8bd6-a776-e9d51dd00739@mentor.com \
--to=tom_devries@mentor.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=jason@redhat.com \
--cc=joseph@codesourcery.com \
/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).