backport: calls.c (emit_library_call_value_1): Use slot_offset instead of offset...

	Backport from mainline:
	2009-02-20  Jaka Mocnik  <jaka@xlab.si>

	* calls.c (emit_library_call_value_1): Use slot_offset instead of
	offset when calculating bounds for indexing stack_usage_map.  Fixes
	a buffer overflow with certain target setups.

From-SVN: r144350

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2f995930002b9ed99c1b2cceef4408de22472f89..ede8715f3e81df432072765e1ce191599baa84f3 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2009-02-21  Uros Bizjak  <ubizjak@gmail.com>
+
+       Backport from mainline:
+       2009-02-20  Jaka Mocnik  <jaka@xlab.si>
+
+       * calls.c (emit_library_call_value_1): Use slot_offset instead of
+       offset when calculating bounds for indexing stack_usage_map.  Fixes
+       a buffer overflow with certain target setups.
+
 2009-02-20  Steve Ellcey  <sje@cup.hp.com>
 
        PR target/38056

diff --git a/gcc/calls.c b/gcc/calls.c
index 4651d3adc93c2ca89dd5c4b937faee796d809356..a9554a6c223ce89a5fbc6a4750ba796077930af8 100644 (file)
--- a/gcc/calls.c
+++ b/gcc/calls.c
@@ -3677,10 +3677,10 @@ emit_library_call_value_1 (int retval, rtx orgfun, rtx value,
 #ifdef ARGS_GROW_DOWNWARD
              /* stack_slot is negative, but we want to index stack_usage_map
                 with positive values.  */
-             upper_bound = -argvec[argnum].locate.offset.constant + 1;
+             upper_bound = -argvec[argnum].locate.slot_offset.constant + 1;
              lower_bound = upper_bound - argvec[argnum].locate.size.constant;
 #else
-             lower_bound = argvec[argnum].locate.offset.constant;
+             lower_bound = argvec[argnum].locate.slot_offset.constant;
              upper_bound = lower_bound + argvec[argnum].locate.size.constant;
 #endif