From f37fac2b74df114c5b3e9c8a3be2cad9acd3f4ca Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Thu, 21 Dec 2017 06:57:41 +0000 Subject: poly_int: get_inner_reference & co. This patch makes get_inner_reference and ptr_difference_const return the bit size and bit position as poly_int64s rather than HOST_WIDE_INTS. The non-mechanical changes were handled by previous patches. 2017-12-21 Richard Sandiford Alan Hayward David Sherwood gcc/ * tree.h (get_inner_reference): Return the bitsize and bitpos as poly_int64_pods rather than HOST_WIDE_INT. * fold-const.h (ptr_difference_const): Return the pointer difference as a poly_int64_pod rather than a HOST_WIDE_INT. * expr.c (get_inner_reference): Return the bitsize and bitpos as poly_int64_pods rather than HOST_WIDE_INT. (expand_expr_addr_expr_1, expand_expr_real_1): Track polynomial offsets and sizes. * fold-const.c (make_bit_field_ref): Take the bitpos as a poly_int64 rather than a HOST_WIDE_INT. Update call to get_inner_reference. (optimize_bit_field_compare): Update call to get_inner_reference. (decode_field_reference): Likewise. (fold_unary_loc): Track polynomial offsets and sizes. (split_address_to_core_and_offset): Return the bitpos as a poly_int64_pod rather than a HOST_WIDE_INT. (ptr_difference_const): Likewise for the pointer difference. * asan.c (instrument_derefs): Track polynomial offsets and sizes. * config/mips/mips.c (r10k_safe_mem_expr_p): Likewise. * dbxout.c (dbxout_expand_expr): Likewise. * dwarf2out.c (loc_list_for_address_of_addr_expr_of_indirect_ref) (loc_list_from_tree_1, fortran_common): Likewise. * gimple-laddress.c (pass_laddress::execute): Likewise. * gimple-ssa-store-merging.c (find_bswap_or_nop_load): Likewise. * gimplify.c (gimplify_scan_omp_clauses): Likewise. * simplify-rtx.c (delegitimize_mem_from_attrs): Likewise. * tree-affine.c (tree_to_aff_combination): Likewise. (get_inner_reference_aff): Likewise. * tree-data-ref.c (split_constant_offset_1): Likewise. (dr_analyze_innermost): Likewise. * tree-scalar-evolution.c (interpret_rhs_expr): Likewise. * tree-sra.c (ipa_sra_check_caller): Likewise. * tree-vect-data-refs.c (vect_check_gather_scatter): Likewise. * ubsan.c (maybe_instrument_pointer_overflow): Likewise. (instrument_bool_enum_load, instrument_object_size): Likewise. * gimple-ssa-strength-reduction.c (slsr_process_ref): Update call to get_inner_reference. * hsa-gen.c (gen_hsa_addr): Likewise. * sanopt.c (maybe_optimize_ubsan_ptr_ifn): Likewise. * tsan.c (instrument_expr): Likewise. * match.pd: Update call to ptr_difference_const. gcc/ada/ * gcc-interface/trans.c (Attribute_to_gnu): Track polynomial offsets and sizes. * gcc-interface/utils2.c (build_unary_op): Likewise. gcc/cp/ * constexpr.c (check_automatic_or_tls): Track polynomial offsets and sizes. Co-Authored-By: Alan Hayward Co-Authored-By: David Sherwood From-SVN: r255914 --- gcc/asan.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gcc/asan.c') diff --git a/gcc/asan.c b/gcc/asan.c index e27338f..144bfb3 100644 --- a/gcc/asan.c +++ b/gcc/asan.c @@ -2076,7 +2076,7 @@ instrument_derefs (gimple_stmt_iterator *iter, tree t, if (size_in_bytes <= 0) return; - HOST_WIDE_INT bitsize, bitpos; + poly_int64 bitsize, bitpos; tree offset; machine_mode mode; int unsignedp, reversep, volatilep = 0; @@ -2094,19 +2094,19 @@ instrument_derefs (gimple_stmt_iterator *iter, tree t, return; } - if (bitpos % BITS_PER_UNIT - || bitsize != size_in_bytes * BITS_PER_UNIT) + if (!multiple_p (bitpos, BITS_PER_UNIT) + || maybe_ne (bitsize, size_in_bytes * BITS_PER_UNIT)) return; if (VAR_P (inner) && DECL_HARD_REGISTER (inner)) return; + poly_int64 decl_size; if (VAR_P (inner) && offset == NULL_TREE - && bitpos >= 0 && DECL_SIZE (inner) - && tree_fits_shwi_p (DECL_SIZE (inner)) - && bitpos + bitsize <= tree_to_shwi (DECL_SIZE (inner))) + && poly_int_tree_p (DECL_SIZE (inner), &decl_size) + && known_subrange_p (bitpos, bitsize, 0, decl_size)) { if (DECL_THREAD_LOCAL_P (inner)) return; -- cgit v1.1