[committed] i386: Fix ICE with -fsplit-stack -mcmodel=large [PR112686]

[committed] i386: Fix ICE with -fsplit-stack -mcmodel=large [PR112686]

[Uros Bizjak]

[-- Attachment #1: Type: text/plain, Size: 381 bytes --]

For -mcmodel=large, we have to load function address to a register.

    PR target/112686

gcc/ChangeLog:

    * config/i386/i386.cc (ix86_expand_split_stack_prologue): Load
    function address to a register for ix86_cmodel == CM_LARGE.

gcc/testsuite/ChangeLog:

    * gcc.target/i386/pr112686.c: New test.

Bootstrapped and regression tested on x86_64-linux-gnu {,-m32}.

Uros.

[-- Attachment #2: p.diff.txt --]
[-- Type: text/plain, Size: 1651 bytes --]

diff --git a/gcc/config/i386/i386.cc b/gcc/config/i386/i386.cc
index 7b922857d80..9390f525b99 100644
--- a/gcc/config/i386/i386.cc
+++ b/gcc/config/i386/i386.cc
@@ -10481,6 +10481,8 @@ ix86_expand_split_stack_prologue (void)
 	      SYMBOL_REF_FLAGS (split_stack_fn_large) |= SYMBOL_FLAG_LOCAL;
 	    }
 
+	  fn = split_stack_fn_large;
+
 	  if (ix86_cmodel == CM_LARGE_PIC)
 	    {
 	      rtx_code_label *label;
@@ -10494,16 +10496,15 @@ ix86_expand_split_stack_prologue (void)
 	      emit_insn (gen_set_rip_rex64 (reg10, label));
 	      emit_insn (gen_set_got_offset_rex64 (reg11, label));
 	      emit_insn (gen_add2_insn (reg10, reg11));
-	      x = gen_rtx_UNSPEC (Pmode, gen_rtvec (1, split_stack_fn_large),
-				  UNSPEC_GOT);
+	      x = gen_rtx_UNSPEC (Pmode, gen_rtvec (1, fn), UNSPEC_GOT);
 	      x = gen_rtx_CONST (Pmode, x);
 	      emit_move_insn (reg11, x);
 	      x = gen_rtx_PLUS (Pmode, reg10, reg11);
 	      x = gen_const_mem (Pmode, x);
 	      fn = copy_to_suggested_reg (x, reg11, Pmode);
 	    }
-	  else
-	    fn = split_stack_fn_large;
+	  else if (ix86_cmodel == CM_LARGE)
+	    fn = copy_to_suggested_reg (fn, reg11, Pmode);
 
 	  /* When using the large model we need to load the address
 	     into a register, and we've run out of registers.  So we
diff --git a/gcc/testsuite/gcc.target/i386/pr112686.c b/gcc/testsuite/gcc.target/i386/pr112686.c
new file mode 100644
index 00000000000..858e91ba727
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr112686.c
@@ -0,0 +1,5 @@
+/* PR target/112686 */
+/* { dg-do compile { target lp64 } } */
+/* { dg-options "-fsplit-stack -mcmodel=large" } */
+
+void foo (void) {}

Re: [committed] i386: Fix ICE with -fsplit-stack -mcmodel=large [PR112686]

[FX Coudert]

Hi Uros,

The new test at gcc.target/i386/pr112686.c fails on darwin with:

Excess errors:
cc1: error: '-fsplit-stack' currently only supported on GNU/Linux
cc1: error: '-fsplit-stack' is not supported by this compiler configuration

It needs an /* { dg-require-effective-target split_stack } */
which I have added and pushed as https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=c54ee4fc1667593081ce80030eeb70838267ad96

FX