diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2f8a0205754f..f85bbae4fda1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-05-13  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gimple-expr.h (is_gimple_constant): Reorder.
+	* tree-ssa-propagate.c (before_dom_children): Use inline accessor.
+
 2015-05-13  Segher Boessenkool  <segher@kernel.crashing.org>
 
 	* combine.c (simplify_set): When generating a CC set, if the
diff --git a/gcc/gimple-expr.h b/gcc/gimple-expr.h
index a50a90a959b1..ed23eb24bfc5 100644
--- a/gcc/gimple-expr.h
+++ b/gcc/gimple-expr.h
@@ -136,9 +136,9 @@ is_gimple_constant (const_tree t)
     case INTEGER_CST:
     case REAL_CST:
     case FIXED_CST:
-    case STRING_CST:
     case COMPLEX_CST:
     case VECTOR_CST:
+    case STRING_CST:
       return true;
 
     default:
diff --git a/gcc/tree-ssa-propagate.c b/gcc/tree-ssa-propagate.c
index e23da7094a4e..cc2b1c4f48f3 100644
--- a/gcc/tree-ssa-propagate.c
+++ b/gcc/tree-ssa-propagate.c
@@ -1246,9 +1246,7 @@ substitute_and_fold_dom_walker::before_dom_children (basic_block bb)
 	      && gimple_call_noreturn_p (stmt))
 	    stmts_to_fixup.safe_push (stmt);
 
-	  if (is_gimple_assign (stmt)
-	      && (get_gimple_rhs_class (gimple_assign_rhs_code (stmt))
-		  == GIMPLE_SINGLE_RHS))
+	  if (gimple_assign_single_p (stmt))
 	    {
 	      tree rhs = gimple_assign_rhs1 (stmt);