]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
openmp, fortran: Fix up IFN_ASSUME call
authorJakub Jelinek <jakub@redhat.com>
Mon, 10 Oct 2022 07:34:35 +0000 (09:34 +0200)
committerJakub Jelinek <jakub@redhat.com>
Mon, 10 Oct 2022 07:38:05 +0000 (09:38 +0200)
Like in other spots in trans-openmp.cc that create a TARGET_EXPR, the
slot has to be created with create_tmp_var_raw, because gfc_create_var
adds the var to BLOCK_VARS and that ICEs during expansion because
gimple_add_tmp_var_fn has:
  gcc_assert (!DECL_CHAIN (tmp) && !DECL_SEEN_IN_BIND_EXPR_P (tmp));
assertion.  Also, both C/C++ ensure the argument to IFN_ASSUME has
boolean_type_node, it is easier if Fortran does that too.

2022-10-10  Jakub Jelinek  <jakub@redhat.com>

* trans-openmp.cc (gfc_trans_omp_assume): Use create_tmp_var_raw
instead of gfc_create_var for TARGET_EXPR slot creation.  Create it
with boolean_type_node and convert.

gcc/fortran/trans-openmp.cc

index 8ea573f7d029909bd025f49094564b4893acc0cc..9bd4e6c7e1b26244a9b6f44b7027b9c9844b4b3c 100644 (file)
@@ -4588,11 +4588,14 @@ gfc_trans_omp_assume (gfc_code *code)
          t = se.expr;
        else
          {
-           tree var = gfc_create_var (TREE_TYPE (se.expr), NULL);
+           tree var = create_tmp_var_raw (boolean_type_node);
+           DECL_CONTEXT (var) = current_function_decl;
            stmtblock_t block2;
            gfc_init_block (&block2);
            gfc_add_block_to_block (&block2, &se.pre);
-           gfc_add_modify_loc (loc, &block2, var, se.expr);
+           gfc_add_modify_loc (loc, &block2, var,
+                               fold_convert_loc (loc, boolean_type_node,
+                                                 se.expr));
            gfc_add_block_to_block (&block2, &se.post);
            t = gfc_finish_block (&block2);
            t = build4 (TARGET_EXPR, boolean_type_node, var, t, NULL, NULL);