From: Jakub Jelinek <jakub@redhat.com>
Date: Mon, 14 Jul 2014 07:31:57 +0000 (+0200)
Subject: re PR target/61656 (Undefined behavior in classify_argument)
X-Git-Tag: releases/gcc-5.1.0~6357
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=03e0ad94a21d03ed7b434d3451a53b1d8be4a061;p=thirdparty%2Fgcc.git

re PR target/61656 (Undefined behavior in classify_argument)

	PR target/61656
	* config/i386/i386.c (classify_argument): Don't merge classes above
	number of words.

From-SVN: r212509
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6017987531ab..673eadfc4717 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-07-14  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/61656
+	* config/i386/i386.c (classify_argument): Don't merge classes above
+	number of words.
+
 2014-07-13  Jan Hubicka  <hubicka@ucw.cz>
 
 	* cgraph.h (symtab_node): Add nonzero_address.
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index e13f4058d407..542945f1176a 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -6581,7 +6581,7 @@ classify_argument (enum machine_mode mode, const_tree type,
 					   bit_offset);
 		  if (!num)
 		    return 0;
-		  for (i = 0; i < num; i++)
+		  for (i = 0; i < num && i < words; i++)
 		    classes[i] = merge_classes (subclasses[i], classes[i]);
 		}
 	    }