From: Nicola Pero <nicola.pero@meta-innovation.com>
Date: Thu, 7 Oct 2010 18:37:43 +0000 (+0000)
Subject: In gcc/: 2010-10-07 Nicola Pero <nicola.pero@meta-innovation.com>
X-Git-Tag: releases/gcc-4.6.0~3775
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=038d22b6c8455f17c2ece0a8029dce9ced05657e;p=thirdparty%2Fgcc.git

In gcc/: 2010-10-07 Nicola Pero <nicola.pero@meta-innovation.com>

In gcc/:
2010-10-07  Nicola Pero  <nicola.pero@meta-innovation.com>

        * doc/objc.texi (Fast enumeration protocol): Mention that
        'unsigned int' can also be used instead of 'unsigned long' in
        countByEnumeratingWithState:objects:count:.

In gcc/objc/:
2010-10-07  Nicola Pero  <nicola.pero@meta-innovation.com>

        PR objc/45925
        * objc-act.c (objc_finish_foreach_loop): Convert return value of
        countByEnumeratingWithState:objects:count: to long unsigned int.

From-SVN: r165129
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 479b616356fb..17610366b287 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-07  Nicola Pero  <nicola.pero@meta-innovation.com>
+
+	* doc/objc.texi (Fast enumeration protocol): Mention that
+	'unsigned int' can also be used instead of 'unsigned long' in
+	countByEnumeratingWithState:objects:count:.
+
 2010-10-07  Martin Jambor  <mjambor@suse.cz>
 
 	* tree-sra.c (struct access): New field grp_assignment_write.
diff --git a/gcc/doc/objc.texi b/gcc/doc/objc.texi
index 2bb80d15254e..87c985d1e679 100644
--- a/gcc/doc/objc.texi
+++ b/gcc/doc/objc.texi
@@ -955,3 +955,8 @@ object is added or removed).  Or, if you are content with less strict
 mutation checks, it could point to the number of objects in your
 collection or some other value that can be checked to perform an
 approximate check that the collection has not been mutated.
+
+Finally, note how we declared the @code{len} argument and the return
+value to be of type @code{unsigned long}.  They could also be declared
+to be of type @code{unsigned int} and everything would still work.
+
diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog
index 9109229da45e..6a69bd9b3f1d 100644
--- a/gcc/objc/ChangeLog
+++ b/gcc/objc/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-07  Nicola Pero  <nicola.pero@meta-innovation.com>
+
+	PR objc/45925
+	* objc-act.c (objc_finish_foreach_loop): Convert return value of
+	countByEnumeratingWithState:objects:count: to long unsigned int.
+
 2010-10-07  Iain Sandoe  <iains@gcc.gnu.org>
 
 	* objc-act.c (build_objc_method_call): Replace calls to 
diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c
index 09fd3be0db36..3a135196f88c 100644
--- a/gcc/objc/objc-act.c
+++ b/gcc/objc/objc-act.c
@@ -10335,7 +10335,8 @@ objc_finish_foreach_loop (location_t location, tree object_expression, tree coll
 				    (NULL_TREE, build_int_cst (NULL_TREE, 16), NULL_TREE))));
   }
 #endif
-  t = build2 (MODIFY_EXPR, void_type_node, objc_foreach_batchsize_decl, t);
+  t = build2 (MODIFY_EXPR, void_type_node, objc_foreach_batchsize_decl,
+	      convert (long_unsigned_type_node, t));
   SET_EXPR_LOCATION (t, location);
   append_to_statement_list (t, &BIND_EXPR_BODY (bind));
 
@@ -10508,7 +10509,8 @@ objc_finish_foreach_loop (location_t location, tree object_expression, tree coll
 				    (NULL_TREE, build_int_cst (NULL_TREE, 16), NULL_TREE))));
   }
 #endif
-  t = build2 (MODIFY_EXPR, void_type_node, objc_foreach_batchsize_decl, t);
+  t = build2 (MODIFY_EXPR, void_type_node, objc_foreach_batchsize_decl, 
+	      convert (long_unsigned_type_node, t));
   SET_EXPR_LOCATION (t, location);
   append_to_statement_list (t, &BIND_EXPR_BODY (next_batch_bind));