From: Ulrich Weigand <uweigand@de.ibm.com>
Date: Sat, 28 Jun 2014 10:23:53 +0000 (+0000)
Subject: rs6000.c (rs6000_aggregate_candidate): Revert accidental change due to wide-int branc... 
X-Git-Tag: releases/gcc-5.1.0~6606
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a86471635f38376128e6cea8d6856f025a57b4c2;p=thirdparty%2Fgcc.git

rs6000.c (rs6000_aggregate_candidate): Revert accidental change due to wide-int branch merge.

2014-06-28  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>

	* config/rs6000/rs6000.c (rs6000_aggregate_candidate): Revert
	accidental change due to wide-int branch merge.

From-SVN: r212100
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9216478dbc67..148477d36b48 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-28  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
+
+	* config/rs6000/rs6000.c (rs6000_aggregate_candidate): Revert
+	accidental change due to wide-int branch merge.
+
 2014-06-27  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
 	* configure.ac (gcc_cv_as_compress_debug): Check for assembler
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index fc7d7665db3a..67690d98b132 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -8766,6 +8766,7 @@ rs6000_aggregate_candidate (const_tree type, enum machine_mode *modep)
 	   fixed.  */
 	if (!COMPLETE_TYPE_P (type)
 	    || TREE_CODE (TYPE_SIZE (type)) != INTEGER_CST)
+	  return -1;
 
 	for (field = TYPE_FIELDS (type); field; field = TREE_CHAIN (field))
 	  {