Tag {ms,sysv}_va_list_type_node with '{ms,sysv}_abi va_list' attribute

2016-08-28  Tom de Vries  <tom@codesourcery.com>

	PR lto/70955
	* config/i386/i386.c (ix86_build_builtin_va_list_64): Tag type with
	'sysv_abi va_list' attribute.
	(ix86_build_builtin_va_list): Tag type with 'ms_abi va_list' attribute.
	(ix86_canonical_va_list_type): Handle 'sysv_abi/ms_abi va_list'
	attributes.

	* gcc.dg/pr70955.c: New test.
	* gcc.dg/lto/pr70955_0.c: Same.
	* gcc.dg/lto/pr70955_1.c: Same.

From-SVN: r239805

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 529ec91f2ea530f91ff19304b1931cbe3cba0e1d..9ddb5bd188bb3819157a49dd18626714f17c5564 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2016-08-28  Tom de Vries  <tom@codesourcery.com>
+
+       PR lto/70955
+       * config/i386/i386.c (ix86_build_builtin_va_list_64): Tag type with
+       'sysv_abi va_list' attribute.
+       (ix86_build_builtin_va_list): Tag type with 'ms_abi va_list' attribute.
+       (ix86_canonical_va_list_type): Handle 'sysv_abi/ms_abi va_list'
+       attributes.
+
 2016-08-27  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
 
        * emit-rtl.h (struct rtl_data): Make stack_slot_list a vector.

diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 3b8b93d97499423ab5233399401e8ffecfab3cb1..4531647e7a6d67ad3b6b920a883cc1e2a4871742 100644 (file)
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -10548,6 +10548,9 @@ ix86_build_builtin_va_list_64 (void)
 
   layout_type (record);
 
+  TYPE_ATTRIBUTES (record) = tree_cons (get_identifier ("sysv_abi va_list"),
+                                       NULL_TREE, TYPE_ATTRIBUTES (record));
+
   /* The correct type is an array type of one element.  */
   return build_array_type (record, build_index_type (size_zero_node));
 }
@@ -10560,17 +10563,36 @@ ix86_build_builtin_va_list (void)
 {
   if (TARGET_64BIT)
     {
-      /* Initialize ABI specific va_list builtin types.  */
-      tree sysv_va_list, ms_va_list;
-
-      sysv_va_list = ix86_build_builtin_va_list_64 ();
-      sysv_va_list_type_node = build_variant_type_copy (sysv_va_list);
+      /* Initialize ABI specific va_list builtin types.
+
+        In lto1, we can encounter two va_list types:
+        - one as a result of the type-merge across TUs, and
+        - the one constructed here.
+        These two types will not have the same TYPE_MAIN_VARIANT, and therefore
+        a type identity check in canonical_va_list_type based on
+        TYPE_MAIN_VARIANT (which we used to have) will not work.
+        Instead, we tag each va_list_type_node with its unique attribute, and
+        look for the attribute in the type identity check in
+        canonical_va_list_type.
+
+        Tagging sysv_va_list_type_node directly with the attribute is
+        problematic since it's a array of one record, which will degrade into a
+        pointer to record when used as parameter (see build_va_arg comments for
+        an example), dropping the attribute in the process.  So we tag the
+        record instead.  */
+
+      /* For SYSV_ABI we use an array of one record.  */
+      sysv_va_list_type_node = ix86_build_builtin_va_list_64 ();
        
       /* For MS_ABI we use plain pointer to argument area.  */
-      ms_va_list = build_pointer_type (char_type_node);
-      ms_va_list_type_node = build_variant_type_copy (ms_va_list);
+      tree char_ptr_type = build_pointer_type (char_type_node);
+      tree attr = tree_cons (get_identifier ("ms_abi va_list"), NULL_TREE,
+                            TYPE_ATTRIBUTES (char_ptr_type));
+      ms_va_list_type_node = build_type_attribute_variant (char_ptr_type, attr);
 
-      return (ix86_abi == MS_ABI) ? ms_va_list : sysv_va_list;
+      return ((ix86_abi == MS_ABI)
+             ? ms_va_list_type_node
+             : sysv_va_list_type_node);
     }
   else
     {
@@ -44644,6 +44666,8 @@ static const struct attribute_spec ix86_attribute_table[] =
   /* ms_abi and sysv_abi calling convention function attributes.  */
   { "ms_abi", 0, 0, false, true, true, ix86_handle_abi_attribute, true },
   { "sysv_abi", 0, 0, false, true, true, ix86_handle_abi_attribute, true },
+  { "ms_abi va_list", 0, 0, false, false, false, NULL, false },
+  { "sysv_abi va_list", 0, 0, false, false, false, NULL, false },
   { "ms_hook_prologue", 0, 0, true, false, false, ix86_handle_fndecl_attribute,
     false },
   { "callee_pop_aggregate_return", 1, 1, false, true, true,
@@ -48538,8 +48562,6 @@ ix86_fn_abi_va_list (tree fndecl)
 static tree
 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);
@@ -48548,64 +48570,25 @@ ix86_canonical_va_list_type (tree 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)
+  if (TARGET_64BIT)
     {
-      wtype = va_list_type_node;
-         gcc_assert (wtype != NULL_TREE);
-      htype = type;
-      if (TREE_CODE (wtype) == ARRAY_TYPE)
-       {
-         /* If va_list is an array type, the argument may have decayed
-            to a pointer type, e.g. by being passed to another function.
-            In that case, unwrap both types so that we can compare the
-            underlying records.  */
-         if (TREE_CODE (htype) == ARRAY_TYPE
-             || POINTER_TYPE_P (htype))
-           {
-             wtype = TREE_TYPE (wtype);
-             htype = TREE_TYPE (htype);
-           }
-       }
-      if (TYPE_MAIN_VARIANT (wtype) == TYPE_MAIN_VARIANT (htype))
-       return va_list_type_node;
-      wtype = sysv_va_list_type_node;
-         gcc_assert (wtype != NULL_TREE);
-      htype = type;
-      if (TREE_CODE (wtype) == ARRAY_TYPE)
-       {
-         /* If va_list is an array type, the argument may have decayed
-            to a pointer type, e.g. by being passed to another function.
-            In that case, unwrap both types so that we can compare the
-            underlying records.  */
-         if (TREE_CODE (htype) == ARRAY_TYPE
-             || POINTER_TYPE_P (htype))
-           {
-             wtype = TREE_TYPE (wtype);
-             htype = TREE_TYPE (htype);
-           }
-       }
-      if (TYPE_MAIN_VARIANT (wtype) == TYPE_MAIN_VARIANT (htype))
-       return sysv_va_list_type_node;
-      wtype = ms_va_list_type_node;
-         gcc_assert (wtype != NULL_TREE);
-      htype = type;
-      if (TREE_CODE (wtype) == ARRAY_TYPE)
+      if (lookup_attribute ("ms_abi va_list", TYPE_ATTRIBUTES (type)))
+       return ms_va_list_type_node;
+
+      if ((TREE_CODE (type) == ARRAY_TYPE
+          && integer_zerop (array_type_nelts (type)))
+         || POINTER_TYPE_P (type))
        {
-         /* If va_list is an array type, the argument may have decayed
-            to a pointer type, e.g. by being passed to another function.
-            In that case, unwrap both types so that we can compare the
-            underlying records.  */
-         if (TREE_CODE (htype) == ARRAY_TYPE
-             || POINTER_TYPE_P (htype))
-           {
-             wtype = TREE_TYPE (wtype);
-             htype = TREE_TYPE (htype);
-           }
+         tree elem_type = TREE_TYPE (type);
+         if (TREE_CODE (elem_type) == RECORD_TYPE
+             && lookup_attribute ("sysv_abi va_list",
+                                  TYPE_ATTRIBUTES (elem_type)))
+           return sysv_va_list_type_node;
        }
-      if (TYPE_MAIN_VARIANT (wtype) == TYPE_MAIN_VARIANT (htype))
-       return ms_va_list_type_node;
+
       return NULL_TREE;
     }
+
   return std_canonical_va_list_type (type);
 }
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 344aa203b0fa42453563af87801ace82b2507149..ae34d88645980a07cf89d5909e67488a55ef8f7c 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2016-08-28  Tom de Vries  <tom@codesourcery.com>
+
+       PR lto/70955
+       * gcc.dg/pr70955.c: New test.
+       * gcc.dg/lto/pr70955_0.c: Same.
+       * gcc.dg/lto/pr70955_1.c: Same.
+
 2016-08-27  Patrick Palka  <ppalka@gcc.gnu.org>
 
        PR tree-optimization/71077

diff --git a/gcc/testsuite/gcc.dg/lto/pr70955_0.c b/gcc/testsuite/gcc.dg/lto/pr70955_0.c
new file mode 100644 (file)
index 0000000..c3b75fc
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/lto/pr70955_0.c
@@ -0,0 +1,13 @@
+/* __builtin_ms_va_list is only supported for x86_64 -m64.  */
+/* { dg-skip-if "" { ! {x86_64-*-* && { ! ilp32 } } } } */
+
+#include <stdio.h>
+
+int __attribute__((ms_abi)) va_demo (int count, ...);
+
+int
+main (void)
+{
+  printf ("sum == %d\n", va_demo (5, 1, 2, 3, 4, 5));
+  return 0;
+}

diff --git a/gcc/testsuite/gcc.dg/lto/pr70955_1.c b/gcc/testsuite/gcc.dg/lto/pr70955_1.c
new file mode 100644 (file)
index 0000000..204c28b
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/lto/pr70955_1.c
@@ -0,0 +1,16 @@
+int __attribute__((ms_abi))
+va_demo (int count, ...)
+{
+  int sum = 0;
+  __builtin_ms_va_list ap;
+
+  __builtin_ms_va_start (ap, count);
+  while (count)
+    {
+      sum += __builtin_va_arg (ap, int);
+      --count;
+    }
+
+  __builtin_ms_va_end (ap);
+  return sum;
+}

diff --git a/gcc/testsuite/gcc.dg/pr70955.c b/gcc/testsuite/gcc.dg/pr70955.c
new file mode 100644 (file)
index 0000000..1275a5f
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr70955.c
@@ -0,0 +1,36 @@
+/* __builtin_ms_va_list is only supported for x86_64 -m64.  */
+/* { dg-do run { target { x86_64-*-* && { ! ilp32 } } } } */
+/* { dg-require-effective-target lto } */
+/* { dg-options "-flto" } */
+
+#include <stdio.h>
+
+int __attribute__((ms_abi))
+foo (int n, ...)
+{
+  __builtin_ms_va_list ap;
+  int sum = 0;
+
+  __builtin_ms_va_start (ap, n);
+
+  while (n--)
+    {
+      sum += __builtin_va_arg (ap, int);
+      printf ("sum = %d\n", sum);
+    }
+
+  __builtin_ms_va_end (ap);
+
+  return sum;
+}
+
+int
+main (void)
+{
+  int res = foo (10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+
+  if (res != 55)
+    __builtin_abort ();
+
+  return 0;
+}