diff --git a/ir_private.h b/ir_private.h index 1a53cd7..e4b27bb 100644 --- a/ir_private.h +++ b/ir_private.h @@ -1015,10 +1015,9 @@ struct _ir_live_range { #define IR_LIVE_INTERVAL_HAS_HINT_REFS (1<<5) #define IR_LIVE_INTERVAL_MEM_PARAM (1<<6) #define IR_LIVE_INTERVAL_MEM_LOAD (1<<7) -#define IR_LIVE_INTERVAL_REG_LOAD (1<<8) -#define IR_LIVE_INTERVAL_SPILL_SPECIAL (1<<9) /* spill slot is pre-allocated in a special area (see ir_ctx.spill_reserved_base) */ -#define IR_LIVE_INTERVAL_SPILLED (1<<10) -#define IR_LIVE_INTERVAL_SPLIT_CHILD (1<<11) +#define IR_LIVE_INTERVAL_SPILL_SPECIAL (1<<8) /* spill slot is pre-allocated in a special area (see ir_ctx.spill_reserved_base) */ +#define IR_LIVE_INTERVAL_SPILLED (1<<9) +#define IR_LIVE_INTERVAL_SPLIT_CHILD (1<<10) struct _ir_live_interval { uint8_t type; diff --git a/ir_ra.c b/ir_ra.c index 3db6e9d..3134dab 100644 --- a/ir_ra.c +++ b/ir_ra.c @@ -3289,9 +3289,6 @@ static int ir_linear_scan(ir_ctx *ctx) if (ival) { if (ival->flags & IR_LIVE_INTERVAL_VAR) { /* pass */ - } else if (ival->flags & IR_LIVE_INTERVAL_REG_LOAD) { - /* pre-allocated fixed register */ - IR_ASSERT(IR_REGSET_IN(IR_REGSET_UNION(ctx->fixed_regset, IR_REGSET_FIXED), ival->reg)); } else if (!(ival->flags & (IR_LIVE_INTERVAL_MEM_PARAM|IR_LIVE_INTERVAL_MEM_LOAD)) || !ir_ival_spill_for_fuse_load(ctx, ival, &data)) { ir_add_to_unhandled(&unhandled, ival);