gimple.h (gimple_expr_type): Refactor to make it concise.

2015-05-22  hiraditya  <hiraditya@msn.com>

        * gimple.h (gimple_expr_type): Refactor to make it concise.
        Remove redundant if.

From-SVN: r223529

gcc/ChangeLog

+2015-05-22  hiraditya  <hiraditya@msn.com>
+
+	* gimple.h (gimple_expr_type): Refactor to make it concise. Remove
+	redundant if.
+
 2015-05-22  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/65701

gcc/gimple.h

@@ -5717,10 +5717,6 @@ static inline tree
 gimple_expr_type (const_gimple stmt)
 {
   enum gimple_code code = gimple_code (stmt);
-
-  if (code == GIMPLE_ASSIGN || code == GIMPLE_CALL)
-    {
-      tree type;
   /* In general we want to pass out a type that can be substituted
      for both the RHS and the LHS types if there is a possibly
      useless conversion involved.  That means returning the
@@ -5730,23 +5726,17 @@ gimple_expr_type (const_gimple stmt)
       const gcall *call_stmt = as_a <const gcall *> (stmt);
       if (gimple_call_internal_p (call_stmt)
           && gimple_call_internal_fn (call_stmt) == IFN_MASK_STORE)
-	    type = TREE_TYPE (gimple_call_arg (call_stmt, 3));
+        return TREE_TYPE (gimple_call_arg (call_stmt, 3));
       else
-	    type = gimple_call_return_type (call_stmt);
+        return gimple_call_return_type (call_stmt);
     }
-      else
-	switch (gimple_assign_rhs_code (stmt))
+  else if (code == GIMPLE_ASSIGN)
     {
-	  case POINTER_PLUS_EXPR:
-	    type = TREE_TYPE (gimple_assign_rhs1 (stmt));
-	    break;
-
-	  default:
+      if (gimple_assign_rhs_code (stmt) == POINTER_PLUS_EXPR)
+        return TREE_TYPE (gimple_assign_rhs1 (stmt));
+      else
         /* As fallback use the type of the LHS.  */
-	    type = TREE_TYPE (gimple_get_lhs (stmt));
-	    break;
-	  }
-      return type;
+        return TREE_TYPE (gimple_get_lhs (stmt));
     }
   else if (code == GIMPLE_COND)
     return boolean_type_node;