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

re PR rtl-optimization/12289 (Solaris 9/Intel bootstrap failure: ICE in expand_call compiling java/io/ObjectInputStream.java) 

PR optimization/12289
	* calls.c (emit_call_1): Pretend to have popped the arguments
	to noreturn and longjmp functions instead of ignoring them.
	(expand_call): Don't adjust stack_pointer_dela while
	inhibit_defer_pop is set.

Co-Authored-By: Roger Sayle <roger@eyesopen.com>

From-SVN: r72073
This commit is contained in:
Jeff Sturm 2003-10-03 17:59:37 +00:00 committed by Roger Sayle
parent c6c51600ab
commit f451eeefad
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gcc/ChangeLog
View File

@ -1,3 +1,12 @@
2003-10-03 Jeff Sturm <jsturm@one-point.com>
Roger Sayle <roger@eyesopen.com>
PR optimization/12289
* calls.c (emit_call_1): Pretend to have popped the arguments
to noreturn and longjmp functions instead of ignoring them.
(expand_call): Don't adjust stack_pointer_dela while
inhibit_defer_pop is set.
2003-10-03 Andreas Schwab <schwab@suse.de>
PR bootstrap/12276

17
gcc/calls.c
View File

@ -530,10 +530,6 @@ emit_call_1 (rtx funexp, tree fndecl ATTRIBUTE_UNUSED, tree funtype ATTRIBUTE_UN
if the context of the call as a whole permits. */
inhibit_defer_pop = old_inhibit_defer_pop;
/* Don't bother cleaning up after a noreturn function. */
if (ecf_flags & (ECF_NORETURN | ECF_LONGJMP))
return;
if (n_popped > 0)
{
if (!already_popped)
@ -557,7 +553,7 @@ emit_call_1 (rtx funexp, tree fndecl ATTRIBUTE_UNUSED, tree funtype ATTRIBUTE_UN
if (rounded_stack_size != 0)
{
if (ecf_flags & ECF_SP_DEPRESSED)
if (ecf_flags & (ECF_SP_DEPRESSED | ECF_NORETURN | ECF_LONGJMP))
/* Just pretend we did the pop. */
stack_pointer_delta -= rounded_stack_size;
else if (flag_defer_pop && inhibit_defer_pop == 0
@ -3171,9 +3167,14 @@ expand_call (tree exp, rtx target, int ignore)
emit_barrier_after (last);
/* Stack adjustments after a noreturn call are dead code. */
stack_pointer_delta = old_stack_allocated;
pending_stack_adjust = 0;
/* Stack adjustments after a noreturn call are dead code.
However when NO_DEFER_POP is in effect, we must preserve
stack_pointer_delta. */
if (inhibit_defer_pop == 0)
{
stack_pointer_delta = old_stack_allocated;
pending_stack_adjust = 0;
}
}
if (flags & ECF_LONGJMP)