aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2014-07-14 09:31:57 +0200
committerJakub Jelinek <jakub@gcc.gnu.org>2014-07-14 09:31:57 +0200
commit03e0ad94a21d03ed7b434d3451a53b1d8be4a061 (patch)
treeacddbf9a8ad7a98911487e3f86b130f1b1bc58d0
parente89ff446df48a43c632c316e64a5fbb1b95d227e (diff)
downloadgcc-03e0ad94a21d03ed7b434d3451a53b1d8be4a061.zip
gcc-03e0ad94a21d03ed7b434d3451a53b1d8be4a061.tar.gz
gcc-03e0ad94a21d03ed7b434d3451a53b1d8be4a061.tar.bz2
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
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/config/i386/i386.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6017987..673eadf 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 e13f405..542945f 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]);
}
}