OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR target/40718 (Invalid code produced with -foptimize-sibling-calls) 

PR target/40718
	* config/i386/i386.c (*call_pop_1): Disable for sibling calls.
	(*call_value_pop_1): Ditto.
	(*sibcall_pop_1): New insn pattern.
	(*sibcall_value_pop_1): Ditto.

testsuite/ChangeLog:

	PR target/40718
	* gcc.target/i386/pr40718.c: New test.

From-SVN: r151030
This commit is contained in:
Uros Bizjak 2009-08-23 14:37:53 +02:00 committed by Uros Bizjak
parent 8d27698831
commit bfed70ad5c
4 changed files with 78 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/ChangeLog
View File

@ -1,3 +1,11 @@
2009-08-23 Uros Bizjak <ubizjak@gmail.com>
PR target/40718
* config/i386/i386.c (*call_pop_1): Disable for sibling calls.
(*call_value_pop_1): Ditto.
(*sibcall_pop_1): New insn pattern.
(*sibcall_value_pop_1): Ditto.
2009-08-20 Andreas Krebbel <krebbel1@de.ibm.com>
* config/s390/s390.c (Z10_PREDICT_DISTANCE): New macro.

51
gcc/config/i386/i386.md
View File

@ -14973,22 +14973,25 @@
(match_operand:SI 1 "" ""))
(set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG)
(match_operand:SI 2 "immediate_operand" "i")))]
"!TARGET_64BIT"
"!SIBLING_CALL_P (insn) && !TARGET_64BIT"
{
if (constant_call_address_operand (operands[0], Pmode))
{
if (SIBLING_CALL_P (insn))
return "jmp\t%P0";
else
return "call\t%P0";
}
if (SIBLING_CALL_P (insn))
return "jmp\t%A0";
else
return "call\t%A0";
return "call\t%P0";
return "call\t%A0";
}
[(set_attr "type" "call")])
(define_insn "*sibcall_pop_1"
[(call (mem:QI (match_operand:SI 0 "sibcall_insn_operand" "s,U"))
(match_operand:SI 1 "" ""))
(set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG)
(match_operand:SI 2 "immediate_operand" "i,i")))]
"SIBLING_CALL_P (insn) && !TARGET_64BIT"
"@
jmp\t%P0
jmp\t%A0"
[(set_attr "type" "call")])
(define_expand "call"
[(call (match_operand:QI 0 "" "")
(match_operand 1 "" ""))
@ -21469,22 +21472,26 @@
(match_operand:SI 2 "" "")))
(set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG)
(match_operand:SI 3 "immediate_operand" "i")))]
"!TARGET_64BIT"
"!SIBLING_CALL_P (insn) && !TARGET_64BIT"
{
if (constant_call_address_operand (operands[1], Pmode))
{
if (SIBLING_CALL_P (insn))
return "jmp\t%P1";
else
return "call\t%P1";
}
if (SIBLING_CALL_P (insn))
return "jmp\t%A1";
else
return "call\t%A1";
return "call\t%P1";
return "call\t%A1";
}
[(set_attr "type" "callv")])
(define_insn "*sibcall_value_pop_1"
[(set (match_operand 0 "" "")
(call (mem:QI (match_operand:SI 1 "call_insn_operand" "s,U"))
(match_operand:SI 2 "" "")))
(set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG)
(match_operand:SI 3 "immediate_operand" "i,i")))]
"SIBLING_CALL_P (insn) && !TARGET_64BIT"
"@
jmp\t%P1
jmp\t%A1"
[(set_attr "type" "callv")])
(define_insn "*call_value_0"
[(set (match_operand 0 "" "")
(call (mem:QI (match_operand:SI 1 "constant_call_address_operand" ""))

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2009-08-23 Uros Bizjak <ubizjak@gmail.com>
PR target/40718
* gcc.target/i386/pr40718.c: New test.
2009-08-21 Jakub Jelinek <jakub@redhat.com>
PR c++/41131

36
gcc/testsuite/gcc.target/i386/pr40718.c Normal file
View File

@ -0,0 +1,36 @@
/* { dg-do run } */
/* { dg-require-effective-target ilp32 } */
/* { dg-options "-O1 -foptimize-sibling-calls" } */
void abort (void);
struct S
{
void (__attribute__((__stdcall__)) *f) (struct S *);
int i;
};
void __attribute__((__stdcall__))
foo (struct S *s)
{
s->i++;
}
void __attribute__((__stdcall__))
bar (struct S *s)
{
foo(s);
s->f(s);
}
int main (void)
{
struct S s = { foo, 0 };
bar (&s);
if (s.i != 2)
abort ();
return 0;
}