aboutsummaryrefslogtreecommitdiff
path: root/gcc/expmed.c
diff options
context:
space:
mode:
authorRichard Sandiford <richard.sandiford@arm.com>2016-11-18 10:04:53 +0000
committerRichard Sandiford <rsandifo@gcc.gnu.org>2016-11-18 10:04:53 +0000
commitf079167a3064f11a7d8c17ef78389559435bad9d (patch)
tree088a5faa65bea2b992c890d73bbec5c40806cb74 /gcc/expmed.c
parent899ca90e6defb9d63e03764ceb9afe0fc94fbdb1 (diff)
downloadgcc-f079167a3064f11a7d8c17ef78389559435bad9d.zip
gcc-f079167a3064f11a7d8c17ef78389559435bad9d.tar.gz
gcc-f079167a3064f11a7d8c17ef78389559435bad9d.tar.bz2
Use rtx_mode_t instead of std::make_pair
This change makes the code less sensitive to the exact type of the mode, i.e. it forces a conversion where necessary. This becomes important when wrappers like scalar_int_mode and scalar_mode can also be used instead of machine_mode. Using rtx_mode_t also abstracts away the representation. The fact that it's a std::pair rather than a custom class isn't important to users of the interface. gcc/ 2016-11-18 Richard Sandiford <richard.sandiford@arm.com> Alan Hayward <alan.hayward@arm.com> David Sherwood <david.sherwood@arm.com> * combine.c (try_combine): Use rtx_mode_t instead of std::make_pair. * dwarf2out.c (mem_loc_descriptor, loc_descriptor): Likewise. (add_const_value_attribute): Likewise. * explow.c (plus_constant): Likewise. * expmed.c (expand_mult, make_tree): Likewise. * expr.c (convert_modes): Likewise. * loop-doloop.c (doloop_optimize): Likewise. * postreload.c (reload_cse_simplify_set): Likewise. * simplify-rtx.c (simplify_const_unary_operation): Likewise. (simplify_binary_operation_1, simplify_const_binary_operation): (simplify_const_relational_operation, simplify_immed_subreg): Likewise. * wide-int.h: Update documentation to recommend rtx_mode_t instead of std::make_pair. Co-Authored-By: Alan Hayward <alan.hayward@arm.com> Co-Authored-By: David Sherwood <david.sherwood@arm.com> From-SVN: r242586
Diffstat (limited to 'gcc/expmed.c')
-rw-r--r--gcc/expmed.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/expmed.c b/gcc/expmed.c
index 69109db..a21a632 100644
--- a/gcc/expmed.c
+++ b/gcc/expmed.c
@@ -3276,7 +3276,7 @@ expand_mult (machine_mode mode, rtx op0, rtx op1, rtx target,
else if (CONST_DOUBLE_AS_INT_P (scalar_op1))
#endif
{
- int shift = wi::exact_log2 (std::make_pair (scalar_op1, mode));
+ int shift = wi::exact_log2 (rtx_mode_t (scalar_op1, mode));
/* Perfect power of 2 (other than 1, which is handled above). */
if (shift > 0)
return expand_shift (LSHIFT_EXPR, mode, op0,
@@ -5092,7 +5092,7 @@ make_tree (tree type, rtx x)
{
case CONST_INT:
case CONST_WIDE_INT:
- t = wide_int_to_tree (type, std::make_pair (x, TYPE_MODE (type)));
+ t = wide_int_to_tree (type, rtx_mode_t (x, TYPE_MODE (type)));
return t;
case CONST_DOUBLE: