From: Tom de Vries <tom@codesourcery.com>
Date: Mon, 29 Aug 2016 16:42:16 +0000 (+0000)
Subject: Fix assert in build_va_arg, case 2b
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=34cedad50c75e63d0898db1f117ec236bd4e3891;p=gcc.git

Fix assert in build_va_arg, case 2b

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

	* c-common.c (build_va_arg): Fix type comparison assert.

From-SVN: r239829
---

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 157adc91e65..07be3bbd5b0 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,7 @@
+2016-08-29  Tom de Vries  <tom@codesourcery.com>
+
+	* c-common.c (build_va_arg): Fix type comparison assert.
+
 2016-08-29  Tom de Vries  <tom@codesourcery.com>
 
 	* c-common.c (build_va_arg): Replace first argument type error
diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c
index 3d4e97b8f8f..00f19ff24ef 100644
--- a/gcc/c-family/c-common.c
+++ b/gcc/c-family/c-common.c
@@ -5906,7 +5906,10 @@ build_va_arg (location_t loc, tree expr, tree type)
     {
       /* Case 2b: va_list is pointer to array elem type.  */
       gcc_assert (POINTER_TYPE_P (va_type));
-      gcc_assert (TREE_TYPE (va_type) == TREE_TYPE (canon_va_type));
+
+      /* Comparison as in std_canonical_va_list_type.  */
+      gcc_assert (TYPE_MAIN_VARIANT (TREE_TYPE (va_type))
+		  == TYPE_MAIN_VARIANT (TREE_TYPE (canon_va_type)));
 
       /* Don't take the address.  We've already got '&ap'.  */
       ;