diff mbox

C PATCH for c/71574 (ICE with alloc_align attribute)

Message ID 20160728132650.GF7007@redhat.com
State New
Headers show

Commit Message

Marek Polacek July 28, 2016, 1:26 p.m. UTC 
Many attributes that accept integer constant as a parameter call
default_conversion for such constants to perform the usual arithmetic
conversions.  The call to default_conversion is always guarded so as
to prevent a NULL_TREE, an IDENTIFIER_NODE, or a FUNCTION_DECL from
getting into this function.  But the alloc_align attribute was missing
the FUNCTION_DECL check, so we were crashing when someone passed a
function decl as a parameter to it.

Bootstrapped/regtested on x86_64-linux, ok for trunk?

2016-07-28  Marek Polacek  <polacek@redhat.com>

	PR c/71574
	* c-common.c (handle_alloc_align_attribute): Also check FUNCTION_DECL.

	* c-c++-common/pr71574.c: New test.


	Marek

Comments

Bernd Schmidt July 29, 2016, 11:16 a.m. UTC | #1 
On 07/28/2016 03:26 PM, Marek Polacek wrote:
> Many attributes that accept integer constant as a parameter call
> default_conversion for such constants to perform the usual arithmetic
> conversions.  The call to default_conversion is always guarded so as
> to prevent a NULL_TREE, an IDENTIFIER_NODE, or a FUNCTION_DECL from
> getting into this function.  But the alloc_align attribute was missing
> the FUNCTION_DECL check, so we were crashing when someone passed a
> function decl as a parameter to it.
>
> Bootstrapped/regtested on x86_64-linux, ok for trunk?
>
> 2016-07-28  Marek Polacek  <polacek@redhat.com>
>
> 	PR c/71574
> 	* c-common.c (handle_alloc_align_attribute): Also check FUNCTION_DECL.
>
> 	* c-c++-common/pr71574.c: New test.

Ok.


Bernd
diff mbox

Patch

diff --git gcc/c-family/c-common.c gcc/c-family/c-common.c
index 16e3965..efd9815 100644
--- gcc/c-family/c-common.c
+++ gcc/c-family/c-common.c
@@ -8370,7 +8370,8 @@  handle_alloc_align_attribute (tree *node, tree, tree args, int,
 {
   unsigned arg_count = type_num_arguments (*node);
   tree position = TREE_VALUE (args);
-  if (position && TREE_CODE (position) != IDENTIFIER_NODE)
+  if (position && TREE_CODE (position) != IDENTIFIER_NODE
+      && TREE_CODE (position) != FUNCTION_DECL)
     position = default_conversion (position);
 
   if (!tree_fits_uhwi_p (position)
diff --git gcc/testsuite/c-c++-common/pr71574.c gcc/testsuite/c-c++-common/pr71574.c
index e69de29..320ae38 100644
--- gcc/testsuite/c-c++-common/pr71574.c
+++ gcc/testsuite/c-c++-common/pr71574.c
@@ -0,0 +1,12 @@ 
+/* PR c/71574 */
+/* { dg-do compile } */
+
+int fn1 (void);
+int fn2 (void) __attribute__ ((alloc_align (fn1))); /* { dg-warning "parameter outside range" } */
+int fn3 (void) __attribute__ ((alloc_size (fn1))); /* { dg-warning "parameter outside range" } */
+int fn4 (void) __attribute__ ((assume_aligned (fn1))); /* { dg-warning "not integer constant" } */
+int fn5 (char *, char *) __attribute__((nonnull (fn1))); /* { dg-error "nonnull argument has invalid operand" } */
+int fn6 (const char *, ...) __attribute__ ((sentinel (fn1))); /* { dg-warning "not an integer constant" } */
+
+typedef int __attribute__((vector_size (fn1))) v4si; /* { dg-warning "attribute ignored" } */
+typedef int T __attribute__((aligned (fn1))); /* { dg-error "requested alignment is not" } */