aboutsummaryrefslogtreecommitdiff
path: root/gcc/ira-lives.c
diff options
context:
space:
mode:
authorUros Bizjak <uros@gcc.gnu.org>2011-05-09 14:11:25 +0200
committerUros Bizjak <uros@gcc.gnu.org>2011-05-09 14:11:25 +0200
commiteb1485a68b1413b3db7c2cb67efb378658c4ff37 (patch)
treed5aea3efc3350bea77719c98422be119161392a7 /gcc/ira-lives.c
parentc46d001a91568c9fd19ee74c73d34f87ebd4aef5 (diff)
downloadgcc-eb1485a68b1413b3db7c2cb67efb378658c4ff37.zip
gcc-eb1485a68b1413b3db7c2cb67efb378658c4ff37.tar.gz
gcc-eb1485a68b1413b3db7c2cb67efb378658c4ff37.tar.bz2
re PR rtl-optimization/48927 (Issues with "enable" attribute and IRA register preferences)
PR rtl-optimization/48927 * ira-conflicts.c (commutative_constraint_p): Use recog_data.alternative_enabled_p to disable alternatives where "enabled" attribute is false. (get_dup_num): Ditto. * ira-lives.c (single_reg_class): Ditto. (ira_implicitly_set_insn_hard_regs): Ditto. From-SVN: r173568
Diffstat (limited to 'gcc/ira-lives.c')
-rw-r--r--gcc/ira-lives.c26
1 files changed, 17 insertions, 9 deletions
diff --git a/gcc/ira-lives.c b/gcc/ira-lives.c
index 8eb9c03..d308bb3 100644
--- a/gcc/ira-lives.c
+++ b/gcc/ira-lives.c
@@ -726,18 +726,21 @@ mark_hard_reg_early_clobbers (rtx insn, bool live_p)
static enum reg_class
single_reg_class (const char *constraints, rtx op, rtx equiv_const)
{
- int ignore_p;
+ int curr_alt, c;
+ bool ignore_p;
enum reg_class cl, next_cl;
- int c;
cl = NO_REGS;
- for (ignore_p = false;
+ for (ignore_p = false, curr_alt = 0;
(c = *constraints);
constraints += CONSTRAINT_LEN (c, constraints))
- if (c == '#')
+ if (c == '#' || !recog_data.alternative_enabled_p[curr_alt])
ignore_p = true;
else if (c == ',')
- ignore_p = false;
+ {
+ curr_alt++;
+ ignore_p = false;
+ }
else if (! ignore_p)
switch (c)
{
@@ -873,7 +876,7 @@ single_reg_operand_class (int op_num)
void
ira_implicitly_set_insn_hard_regs (HARD_REG_SET *set)
{
- int i, c, regno = 0;
+ int i, curr_alt, c, regno = 0;
bool ignore_p;
enum reg_class cl;
rtx op;
@@ -895,11 +898,16 @@ ira_implicitly_set_insn_hard_regs (HARD_REG_SET *set)
mode = (GET_CODE (op) == SCRATCH
? GET_MODE (op) : PSEUDO_REGNO_MODE (regno));
cl = NO_REGS;
- for (ignore_p = false; (c = *p); p += CONSTRAINT_LEN (c, p))
- if (c == '#')
+ for (ignore_p = false, curr_alt = 0;
+ (c = *p);
+ p += CONSTRAINT_LEN (c, p))
+ if (c == '#' || !recog_data.alternative_enabled_p[curr_alt])
ignore_p = true;
else if (c == ',')
- ignore_p = false;
+ {
+ curr_alt++;
+ ignore_p = false;
+ }
else if (! ignore_p)
switch (c)
{