From 6bd2a4f3d173deaa06680904dd368292208cb95e Mon Sep 17 00:00:00 2001 From: Iain Sandoe Date: Sat, 21 Sep 2019 19:48:27 +0000 Subject: [PATCH] [Darwin] Update machopic_legitimize_pic_address. Some changes were missed here in the transition to LRA. The Darwin archs are all using LRA now. gcc/ChangeLog: 2019-09-21 Iain Sandoe * config/darwin.c (machopic_legitimize_pic_address): Check for lra not reload. From-SVN: r276020 --- gcc/ChangeLog | 5 +++++ gcc/config/darwin.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f22714ede98..014dd8d1a7e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2019-09-21 Iain Sandoe + + * config/darwin.c (machopic_legitimize_pic_address): Check + for lra not reload. + 2019-09-21 Richard Sandiford * ira-conflicts.c (can_use_same_reg_p): New function. diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c index e1017befaf7..3e4bbffc928 100644 --- a/gcc/config/darwin.c +++ b/gcc/config/darwin.c @@ -842,7 +842,7 @@ machopic_legitimize_pic_address (rtx orig, machine_mode mode, rtx reg) { if (reg == 0) { - gcc_assert (!reload_in_progress); + gcc_assert (!lra_in_progress); reg = gen_reg_rtx (Pmode); } @@ -926,7 +926,7 @@ machopic_legitimize_pic_address (rtx orig, machine_mode mode, rtx reg) emit_use (gen_rtx_REG (Pmode, PIC_OFFSET_TABLE_REGNUM)); #endif - if (reload_in_progress) + if (lra_in_progress) df_set_regs_ever_live (REGNO (pic), true); pic_ref = gen_rtx_PLUS (Pmode, pic, machopic_gen_offset (XEXP (orig, 0))); @@ -950,7 +950,7 @@ machopic_legitimize_pic_address (rtx orig, machine_mode mode, rtx reg) if (reg == 0) { - gcc_assert (!reload_in_progress); + gcc_assert (!lra_in_progress); reg = gen_reg_rtx (Pmode); } @@ -996,7 +996,7 @@ machopic_legitimize_pic_address (rtx orig, machine_mode mode, rtx reg) #if 0 emit_use (pic_offset_table_rtx); #endif - if (reload_in_progress) + if (lra_in_progress) df_set_regs_ever_live (REGNO (pic), true); pic_ref = gen_rtx_PLUS (Pmode, pic, -- 2.30.2