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

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index f363d59a7503c2cf2a8283832eb71f6afad41ea8..24ff91f385b4977eb8aa8e79874b42969b7b8294 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -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.

diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c
index 7e59cb6dcb44c4441714dd3e4b19291daf701244..53c248d963bf4e0042542cb89d739a88ce3e4499 100644 (file)
--- a/gcc/fortran/trans-decl.c
+++ b/gcc/fortran/trans-decl.c
@@ -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.

diff --git a/gcc/fortran/trans-stmt.c b/gcc/fortran/trans-stmt.c
index 8bc491655becfb7a765c5377aa4c19299552b1e2..204f069cc537864c955c22bfd58414308cf05d95 100644 (file)
--- a/gcc/fortran/trans-stmt.c
+++ b/gcc/fortran/trans-stmt.c
@@ -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);