gcc/cp/ChangeLog:

	* cp-array-notation.c (cp_expand_cond_array_notations): Return
	error_mark_node only if find_rank failed, not if it was
	successful.

gcc/testsuite/ChangeLog:

	* c-c++-common/cilk-plus/AN/an-if.c: Check that the original
	dump does not contain an error_mark_node.
	* c-c++-common/cilk-plus/CK/pr60469.c: Likewise.
	* c-c++-common/cilk-plus/AN/fn_ptr-2.c: New xfail'd test.

From-SVN: r232462