From 4897c5aaa7a5db4c1ece28ef66acb3d5e41787b3 Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Mon, 9 Sep 2019 17:59:29 +0000 Subject: Remove IOR_COMPL_HARD_REG_SET Use "x |= ~y" instead of "IOR_COMPL_HARD_REG_SET (x, y)", or just "x | ~y" if the result is a temporary. 2019-09-09 Richard Sandiford gcc/ * hard-reg-set.h (IOR_COMPL_HARD_REG_SET): Delete. * config/aarch64/cortex-a57-fma-steering.c (rename_single_chain): Use "|~" instead of IOR_COMPL_HARD_REG_SET. * config/aarch64/falkor-tag-collision-avoidance.c (init_unavailable): Likewise. * ira-build.c (ira_create_object, ira_set_allocno_class): Likewise. * ira.c (setup_reg_renumber): Likewise. * lra-assigns.c (find_hard_regno_for_1): Likewise. * regrename.c (regrename_find_superclass): Likewise. * reload1.c (find_reg): Likewise. From-SVN: r275533 --- gcc/ira-build.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'gcc/ira-build.c') diff --git a/gcc/ira-build.c b/gcc/ira-build.c index 354f989..3170d7d 100644 --- a/gcc/ira-build.c +++ b/gcc/ira-build.c @@ -458,10 +458,8 @@ ira_create_object (ira_allocno_t a, int subword) OBJECT_NUM_CONFLICTS (obj) = 0; OBJECT_CONFLICT_HARD_REGS (obj) = ira_no_alloc_regs; OBJECT_TOTAL_CONFLICT_HARD_REGS (obj) = ira_no_alloc_regs; - IOR_COMPL_HARD_REG_SET (OBJECT_CONFLICT_HARD_REGS (obj), - reg_class_contents[aclass]); - IOR_COMPL_HARD_REG_SET (OBJECT_TOTAL_CONFLICT_HARD_REGS (obj), - reg_class_contents[aclass]); + OBJECT_CONFLICT_HARD_REGS (obj) |= ~reg_class_contents[aclass]; + OBJECT_TOTAL_CONFLICT_HARD_REGS (obj) |= ~reg_class_contents[aclass]; OBJECT_MIN (obj) = INT_MAX; OBJECT_MAX (obj) = -1; OBJECT_LIVE_RANGES (obj) = NULL; @@ -549,10 +547,8 @@ ira_set_allocno_class (ira_allocno_t a, enum reg_class aclass) ALLOCNO_CLASS (a) = aclass; FOR_EACH_ALLOCNO_OBJECT (a, obj, oi) { - IOR_COMPL_HARD_REG_SET (OBJECT_CONFLICT_HARD_REGS (obj), - reg_class_contents[aclass]); - IOR_COMPL_HARD_REG_SET (OBJECT_TOTAL_CONFLICT_HARD_REGS (obj), - reg_class_contents[aclass]); + OBJECT_CONFLICT_HARD_REGS (obj) |= ~reg_class_contents[aclass]; + OBJECT_TOTAL_CONFLICT_HARD_REGS (obj) |= ~reg_class_contents[aclass]; } } -- cgit v1.1