trans-decl.c (gfc_generate_function_code): Fix gfc_option.coarray check.

2012-09-16  Tobias Burnus  <burnus@net-b.de>

        * trans-decl.c (gfc_generate_function_code): Fix
        gfc_option.coarray check.
        * trans-stmt.c (compute_inner_temp_size): Fix handling
        of gfc_option.rtcheck.

From-SVN: r191358
This commit is contained in:
Tobias Burnus 2012-09-16 14:11:04 +02:00 committed by Tobias Burnus
parent 15319c3ed9
commit c3fb821439
3 changed files with 9 additions and 2 deletions

View File

@ -1,3 +1,10 @@
2012-09-16 Tobias Burnus <burnus@net-b.de>
* trans-decl.c (gfc_generate_function_code): Fix
gfc_option.coarray check.
* trans-stmt.c (compute_inner_temp_size): Fix handling
of gfc_option.rtcheck.
2012-09-16 Mikael Morin <mikael@gcc.gnu.org>
* symbol.c (gfc_undo_symbols): Correctly undo namelists.

View File

@ -5480,7 +5480,7 @@ gfc_generate_function_code (gfc_namespace * ns)
}
current_function_decl = old_context;
if (decl_function_context (fndecl) && !gfc_option.coarray == GFC_FCOARRAY_LIB
if (decl_function_context (fndecl) && gfc_option.coarray != GFC_FCOARRAY_LIB
&& has_coarray_vars)
/* Register this function with cgraph just far enough to get it
added to our parent's nested function list.

View File

@ -3132,7 +3132,7 @@ compute_inner_temp_size (gfc_expr *expr1, gfc_expr *expr2,
/* Calculate the bounds of the scalarization. */
save_flag = gfc_option.rtcheck;
gfc_option.rtcheck &= !GFC_RTCHECK_BOUNDS;
gfc_option.rtcheck &= ~GFC_RTCHECK_BOUNDS;
gfc_conv_ss_startstride (&loop);
gfc_option.rtcheck = save_flag;
gfc_conv_loop_setup (&loop, &expr2->where);