@@ -3534,6 +3534,12 @@ expand_gimple_stmt_1 (gimple *stmt)
{
tree result = DECL_RESULT (current_function_decl);
+ /* Mark we have return statement with missing bounds. */
+ if (!bnd
+ && chkp_function_instrumented_p (cfun->decl)
+ && !DECL_P (op0))
+ bnd = error_mark_node;
+
/* If we are not returning the current function's RESULT_DECL,
build an assignment to it. */
if (op0 != result)
@@ -3550,9 +3556,6 @@ expand_gimple_stmt_1 (gimple *stmt)
op0 = build2 (MODIFY_EXPR, TREE_TYPE (result),
result, op0);
}
- /* Mark we have return statement with missing bounds. */
- if (!bnd && chkp_function_instrumented_p (cfun->decl))
- bnd = error_mark_node;
}
if (!op0)