*** empty log message ***

From-SVN: r399

diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c
index 486459234999a080f9868736f7e7144b4ca8c10d..3e525cf399472b431c1fdd59f146a12bb99927be 100644 (file)
--- a/gcc/objc/objc-act.c
+++ b/gcc/objc/objc-act.c
@@ -2603,24 +2603,25 @@ receiver_is_class_object (receiver)
    * ...check if it is a call to objc_getClass, if so, give it
    * special treatment.
    */
-  tree exp = 0;
+  tree exp = TREE_OPERAND (receiver, 0);
 
-  if ((exp = TREE_OPERAND (receiver, 0)) && (TREE_CODE (exp) == ADDR_EXPR))
+  if (exp != 0 && (TREE_CODE (exp) == ADDR_EXPR))
     {
-      if ((exp = TREE_OPERAND (exp, 0)) && 
-         (TREE_CODE (exp) == FUNCTION_DECL) && exp == objc_getClass_decl)
+      exp = TREE_OPERAND (exp, 0);
+      if (exp != 0
+         && TREE_CODE (exp) == FUNCTION_DECL && exp == objc_getClass_decl)
        {
          /* we have a call to objc_getClass! */
-         tree arg = 0;
-    
-         if ((arg = TREE_OPERAND (receiver, 1)) &&
-             (TREE_CODE (arg) == TREE_LIST) &&
-             (arg = TREE_VALUE (arg)) &&
-             (TREE_CODE (arg) == NOP_EXPR) &&
-             (arg = TREE_OPERAND (arg, 0)) &&
-             (TREE_CODE (arg) == ADDR_EXPR) &&
-             (arg = TREE_OPERAND (arg, 0)) &&
-             (TREE_CODE (arg) == STRING_CST))
+         tree arg = TREE_OPERAND (receiver, 1);
+
+         if (arg != 0
+             && TREE_CODE (arg) == TREE_LIST
+             && arg = TREE_VALUE (arg)
+             && TREE_CODE (arg) == NOP_EXPR
+             && arg = TREE_OPERAND (arg, 0)
+             && TREE_CODE (arg) == ADDR_EXPR
+             && arg = TREE_OPERAND (arg, 0)
+             && TREE_CODE (arg) == STRING_CST)
            /* finally, we have the class name */
            return get_identifier (TREE_STRING_POINTER (arg));
        }

diff --git a/gcc/reload1.c b/gcc/reload1.c
index 0ecb2fe378e64cf61ad3bc101789aabc57fc5cee..6daca822107a48732702f18c244c8ac81d4457dc 100644 (file)
--- a/gcc/reload1.c
+++ b/gcc/reload1.c
@@ -702,7 +702,7 @@ reload (first, global, dumpfile)
     if (reg_renumber[i] == -1 && reg_n_refs[i] != 0)
       break;
 
-  if (i == max_regno && num_eliminable = 0 && ! caller_save_needed)
+  if (i == max_regno && num_eliminable == 0 && ! caller_save_needed)
     return;
 #endif