diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 126c14836b4..0beb9974521 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-29  Richard Biener  <rguenther@suse.de>
+
+	* typeck.c (enum_cast_to_int): Use CONVERT_EXPR_P to check
+	for conversions.
+
 2014-09-26  Jason Merrill  <jason@redhat.com>
 
 	* mangle.c (find_substitution): Use write_abi_tags.
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index aa82f1c0a78..61d52bdb833 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -3835,7 +3835,7 @@ build_x_array_ref (location_t loc, tree arg1, tree arg2,
 static bool
 enum_cast_to_int (tree op)
 {
-  if (TREE_CODE (op) == NOP_EXPR
+  if (CONVERT_EXPR_P (op)
       && TREE_TYPE (op) == integer_type_node
       && TREE_CODE (TREE_TYPE (TREE_OPERAND (op, 0))) == ENUMERAL_TYPE
       && TYPE_UNSIGNED (TREE_TYPE (TREE_OPERAND (op, 0))))