Allow indirect sibcall with register arguments

Indirect sibcall with register arguments is OK when there is register
available for argument passing.

gcc/

	PR target/66819
	* config/i386/i386.c (ix86_function_ok_for_sibcall): Allow
	indirect sibcall with register arguments if register available
	for argument passing.
	(init_cumulative_args): Set cfun->machine->arg_reg_available
	to (cum->nregs > 0) or to true if function has a variable
	argument list.
	(function_arg_advance_32): Set cfun->machine->arg_reg_available
	to false if cum->nregs <= 0.
	* config/i386/i386.h (machine_function): Add arg_reg_available.

gcc/testsuite/

	PR target/66819
	* gcc.target/i386/pr66819-1.c: New test.
	* gcc.target/i386/pr66819-2.c: Likewise.
	* gcc.target/i386/pr66819-3.c: Likewise.
	* gcc.target/i386/pr66819-4.c: Likewise.
	* gcc.target/i386/pr66819-5.c: Likewise.

From-SVN: r225688

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ccbc320428b3ddca116435dcedf94020668fe932..efaf9d37dc54b1311830b955c3dba378b886cc63 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,16 @@
+2015-07-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR target/66819
+       * config/i386/i386.c (ix86_function_ok_for_sibcall): Allow
+       indirect sibcall with register arguments if register available
+       for argument passing.
+       (init_cumulative_args): Set cfun->machine->arg_reg_available
+       to (cum->nregs > 0) or to true if function has a variable
+       argument list.
+       (function_arg_advance_32): Set cfun->machine->arg_reg_available
+       to false if cum->nregs <= 0.
+       * config/i386/i386.h (machine_function): Add arg_reg_available.
+
 2015-07-10  Uros Bizjak  <ubizjak@gmail.com>
 
        * config/i386/sse.md (movdi_to_sse): Use gen_lowpart

diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 785990a7422519813243641595eed3dcd1043dce..6b5af11a96b2b048916722a286e5b6b055158859 100644 (file)
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -5629,12 +5629,16 @@ ix86_function_ok_for_sibcall (tree decl, tree exp)
       if (!decl
          || (TARGET_DLLIMPORT_DECL_ATTRIBUTES && DECL_DLLIMPORT_P (decl)))
        {
-         if (ix86_function_regparm (type, NULL) >= 3)
-           {
-             /* ??? Need to count the actual number of registers to be used,
-                not the possible number of registers.  Fix later.  */
-             return false;
-           }
+         /* Check if regparm >= 3 since arg_reg_available is set to
+            false if regparm == 0.  If regparm is 1 or 2, there is
+            always a call-clobbered register available.
+
+            ??? The symbol indirect call doesn't need a call-clobbered
+            register.  But we don't know if this is a symbol indirect
+            call or not here.  */
+         if (ix86_function_regparm (type, NULL) >= 3
+             && !cfun->machine->arg_reg_available)
+           return false;
        }
     }
 
@@ -6610,6 +6614,10 @@ init_cumulative_args (CUMULATIVE_ARGS *cum,  /* Argument info to initialize */
       if (stdarg_p (fntype))
        {
          cum->nregs = 0;
+         /* Since in 32-bit, variable arguments are always passed on
+            stack, there is scratch register available for indirect
+            sibcall.  */
+         cfun->machine->arg_reg_available = true;
          cum->sse_nregs = 0;
          cum->mmx_nregs = 0;
          cum->warn_avx512f = false;
@@ -6642,6 +6650,8 @@ init_cumulative_args (CUMULATIVE_ARGS *cum,  /* Argument info to initialize */
         and DFmode arguments.  Warn for mismatching ABI.  */
       cum->float_in_sse = ix86_function_sseregparm (fntype, fndecl, true);
     }
+
+  cfun->machine->arg_reg_available = (cum->nregs > 0);
 }
 
 /* Return the "natural" mode for TYPE.  In most cases, this is just TYPE_MODE.
@@ -7584,6 +7594,7 @@ pass_in_reg:
       if (cum->nregs <= 0)
        {
          cum->nregs = 0;
+         cfun->machine->arg_reg_available = false;
          cum->regno = 0;
        }
       break;

diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h
index 74334ff0c5e64c60f85a78407052f687d16f98fd..0fcf391dbe3cafa40baffa0e061ba7760433299e 100644 (file)
--- a/gcc/config/i386/i386.h
+++ b/gcc/config/i386/i386.h
@@ -2479,6 +2479,13 @@ struct GTY(()) machine_function {
   /* If true, it is safe to not save/restore DRAP register.  */
   BOOL_BITFIELD no_drap_save_restore : 1;
 
+  /* If true, there is register available for argument passing.  This
+     is used only in ix86_function_ok_for_sibcall by 32-bit to determine
+     if there is scratch register available for indirect sibcall.  In
+     64-bit, rax, r10 and r11 are scratch registers which aren't used to
+     pass arguments and can be used for indirect sibcall.  */
+  BOOL_BITFIELD arg_reg_available : 1;
+
   /* During prologue/epilogue generation, the current frame state.
      Otherwise, the frame state at the end of the prologue.  */
   struct machine_frame_state fs;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3c5586ecc81834b3b009e80b49917168f1f8767e..44d391b8ba104f66c91c1a74a6bfea390c63f7a0 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2015-07-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR target/66819
+       * gcc.target/i386/pr66819-1.c: New test.
+       * gcc.target/i386/pr66819-2.c: Likewise.
+       * gcc.target/i386/pr66819-3.c: Likewise.
+       * gcc.target/i386/pr66819-4.c: Likewise.
+       * gcc.target/i386/pr66819-5.c: Likewise.
+
 2015-07-10  Uros Bizjak  <ubizjak@gmail.com>
 
        PR target/66703

diff --git a/gcc/testsuite/gcc.target/i386/pr66819-1.c b/gcc/testsuite/gcc.target/i386/pr66819-1.c
new file mode 100644 (file)
index 0000000..7c8a1ab
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr66819-1.c
@@ -0,0 +1,8 @@
+/* { dg-do compile { target ia32 } } */
+/* { dg-options "-O2 -mregparm=3" } */
+/* { dg-final { scan-assembler-not "call" } } */
+
+void foo(void (*bar)(void))
+{
+  bar();
+}

diff --git a/gcc/testsuite/gcc.target/i386/pr66819-2.c b/gcc/testsuite/gcc.target/i386/pr66819-2.c
new file mode 100644 (file)
index 0000000..9de4f97
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr66819-2.c
@@ -0,0 +1,8 @@
+/* { dg-do compile { target ia32 } } */
+/* { dg-options "-fPIC -O2 -mregparm=3" } */
+/* { dg-final { scan-assembler-not "call" } } */
+
+void foo(void (*bar)(void))
+{
+  bar();
+}

diff --git a/gcc/testsuite/gcc.target/i386/pr66819-3.c b/gcc/testsuite/gcc.target/i386/pr66819-3.c
new file mode 100644 (file)
index 0000000..3bc5a34
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr66819-3.c
@@ -0,0 +1,10 @@
+/* { dg-do compile { target ia32 } } */
+/* { dg-options "-O2 -mregparm=3" } */
+/* { dg-final { scan-assembler-not "call" } } */
+
+void (*bar)(int, int);
+
+void foo(int i, int j)
+{
+  bar(i, j);
+}

diff --git a/gcc/testsuite/gcc.target/i386/pr66819-4.c b/gcc/testsuite/gcc.target/i386/pr66819-4.c
new file mode 100644 (file)
index 0000000..18b2ccf
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr66819-4.c
@@ -0,0 +1,12 @@
+/* { dg-do compile { target ia32 } } */
+/* { dg-options "-O2 -mregparm=3" } */
+/* { dg-final { scan-assembler-not "call" } } */
+
+#include <stdarg.h>
+
+void (*bar)(int, va_list); 
+
+void foo(int i, va_list args)
+{
+  bar(i, args);
+}

diff --git a/gcc/testsuite/gcc.target/i386/pr66819-5.c b/gcc/testsuite/gcc.target/i386/pr66819-5.c
new file mode 100644 (file)
index 0000000..6b019d1
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr66819-5.c
@@ -0,0 +1,10 @@
+/* { dg-do compile { target ia32 } } */
+/* { dg-options "-O2 -mregparm=3" } */
+/* { dg-final { scan-assembler "call" } } */
+
+void (*bar)(int, int, int);
+
+void foo(int i, int j, int k)
+{
+  bar(i, j, k);
+}