From b4e47472c9f2fb618a5b33517dca11ede3419fa9 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 15 Jan 2018 22:47:11 +0100 Subject: [PATCH] re PR middle-end/83837 (libgomp.fortran/pointer[12].f90 FAIL) PR middle-end/83837 * omp-expand.c (expand_omp_atomic_pipeline): Use loaded_val type rather than type addr's type points to. (expand_omp_atomic_mutex): Likewise. (expand_omp_atomic): Likewise. From-SVN: r256710 --- gcc/ChangeLog | 8 ++++++++ gcc/omp-expand.c | 29 ++++++++++++++++++++--------- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5b5045a3d2b..bfaea13b33b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2018-01-15 Jakub Jelinek + + PR middle-end/83837 + * omp-expand.c (expand_omp_atomic_pipeline): Use loaded_val + type rather than type addr's type points to. + (expand_omp_atomic_mutex): Likewise. + (expand_omp_atomic): Likewise. + 2018-01-15 H.J. Lu PR target/83839 diff --git a/gcc/omp-expand.c b/gcc/omp-expand.c index 1e254af2302..8690f863404 100644 --- a/gcc/omp-expand.c +++ b/gcc/omp-expand.c @@ -6283,7 +6283,7 @@ expand_omp_atomic_pipeline (basic_block load_bb, basic_block store_bb, int index) { tree loadedi, storedi, initial, new_storedi, old_vali; - tree type, itype, cmpxchg, iaddr; + tree type, itype, cmpxchg, iaddr, atype; gimple_stmt_iterator si; basic_block loop_header = single_succ (load_bb); gimple *phi, *stmt; @@ -6297,7 +6297,8 @@ expand_omp_atomic_pipeline (basic_block load_bb, basic_block store_bb, cmpxchg = builtin_decl_explicit (fncode); if (cmpxchg == NULL_TREE) return false; - type = TYPE_MAIN_VARIANT (TREE_TYPE (TREE_TYPE (addr))); + type = TYPE_MAIN_VARIANT (TREE_TYPE (loaded_val)); + atype = type; itype = TREE_TYPE (TREE_TYPE (cmpxchg)); if (!can_compare_and_swap_p (TYPE_MODE (itype), true) @@ -6317,6 +6318,7 @@ expand_omp_atomic_pipeline (basic_block load_bb, basic_block store_bb, iaddr = create_tmp_reg (build_pointer_type_for_mode (itype, ptr_mode, true)); + atype = itype; iaddr_val = force_gimple_operand_gsi (&si, fold_convert (TREE_TYPE (iaddr), addr), @@ -6337,13 +6339,17 @@ expand_omp_atomic_pipeline (basic_block load_bb, basic_block store_bb, tree loaddecl = builtin_decl_explicit (fncode); if (loaddecl) initial - = fold_convert (TREE_TYPE (TREE_TYPE (iaddr)), + = fold_convert (atype, build_call_expr (loaddecl, 2, iaddr, build_int_cst (NULL_TREE, MEMMODEL_RELAXED))); else - initial = build2 (MEM_REF, TREE_TYPE (TREE_TYPE (iaddr)), iaddr, - build_int_cst (TREE_TYPE (iaddr), 0)); + { + tree off + = build_int_cst (build_pointer_type_for_mode (atype, ptr_mode, + true), 0); + initial = build2 (MEM_REF, atype, iaddr, off); + } initial = force_gimple_operand_gsi (&si, initial, true, NULL_TREE, true, @@ -6495,15 +6501,20 @@ expand_omp_atomic_mutex (basic_block load_bb, basic_block store_bb, t = build_call_expr (t, 0); force_gimple_operand_gsi (&si, t, true, NULL_TREE, true, GSI_SAME_STMT); - stmt = gimple_build_assign (loaded_val, build_simple_mem_ref (addr)); + tree mem = build_simple_mem_ref (addr); + TREE_TYPE (mem) = TREE_TYPE (loaded_val); + TREE_OPERAND (mem, 1) + = fold_convert (build_pointer_type_for_mode (TREE_TYPE (mem), ptr_mode, + true), + TREE_OPERAND (mem, 1)); + stmt = gimple_build_assign (loaded_val, mem); gsi_insert_before (&si, stmt, GSI_SAME_STMT); gsi_remove (&si, true); si = gsi_last_nondebug_bb (store_bb); gcc_assert (gimple_code (gsi_stmt (si)) == GIMPLE_OMP_ATOMIC_STORE); - stmt = gimple_build_assign (build_simple_mem_ref (unshare_expr (addr)), - stored_val); + stmt = gimple_build_assign (unshare_expr (mem), stored_val); gsi_insert_before (&si, stmt, GSI_SAME_STMT); t = builtin_decl_explicit (BUILT_IN_GOMP_ATOMIC_END); @@ -6532,7 +6543,7 @@ expand_omp_atomic (struct omp_region *region) tree loaded_val = gimple_omp_atomic_load_lhs (load); tree addr = gimple_omp_atomic_load_rhs (load); tree stored_val = gimple_omp_atomic_store_val (store); - tree type = TYPE_MAIN_VARIANT (TREE_TYPE (TREE_TYPE (addr))); + tree type = TYPE_MAIN_VARIANT (TREE_TYPE (loaded_val)); HOST_WIDE_INT index; /* Make sure the type is one of the supported sizes. */ -- 2.30.2