(__objc_send_message_in_list): When setting a new entry in

[pf3gnuchains/gcc-fork.git] / gcc / convert.c

diff --git a/gcc/convert.c b/gcc/convert.c
index 6eea7d6..b97d08f 100644 (file)
--- a/gcc/convert.c
+++ b/gcc/convert.c
@@ -310,13 +310,13 @@ convert_to_integer (type, expr)
                  {
                    /* Don't do unsigned arithmetic where signed was wanted,
                       or vice versa.
-                      Exception: if either of the original operands were
+                      Exception: if both of the original operands were
                       unsigned then can safely do the work as unsigned.
                       And we may need to do it as unsigned
                       if we truncate to the original size.  */
                    typex = ((TREE_UNSIGNED (TREE_TYPE (expr))
-                             || TREE_UNSIGNED (TREE_TYPE (arg0))
-                             || TREE_UNSIGNED (TREE_TYPE (arg1)))
+                             || (TREE_UNSIGNED (TREE_TYPE (arg0))
+                                 && TREE_UNSIGNED (TREE_TYPE (arg1))))
                             ? unsigned_type (typex) : signed_type (typex));
                    return convert (type,
                                    fold (build (ex_form, typex,
@@ -460,8 +460,6 @@ tree
 convert_to_vector (type, expr)
      tree type, expr;
 {
-  tree subtype = TREE_TYPE (type);
-  
   switch (TREE_CODE (TREE_TYPE (expr)))
     {
     case INTEGER_TYPE: