From: Jan Hubicka <jh@suse.cz>
Date: Wed, 22 Jan 2014 22:05:23 +0000 (+0100)
Subject: combine-stack-adj.c (combine_stack_adjustments_for_block): Remove ARG_SIZE note when... 
X-Git-Tag: releases/gcc-4.9.0~1453
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=77b7a218bbe8aca5a7b4da211cbbc4ceb2dd6270;p=thirdparty%2Fgcc.git

combine-stack-adj.c (combine_stack_adjustments_for_block): Remove ARG_SIZE note when adjustment was eliminated.

	* combine-stack-adj.c (combine_stack_adjustments_for_block): Remove
	ARG_SIZE note when adjustment was eliminated.

From-SVN: r206943
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f6df113dc006..af611f7d48bc 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-22  Jan Hubicka  <jh@suse.cz>
+
+	* combine-stack-adj.c (combine_stack_adjustments_for_block): Remove
+	ARG_SIZE note when adjustment was eliminated.
+
 2014-01-22  Jeff Law  <law@redhat.com>
 
 	PR tree-optimization/59597
diff --git a/gcc/combine-stack-adj.c b/gcc/combine-stack-adj.c
index 69fd5ea77e3a..c591c604b8a8 100644
--- a/gcc/combine-stack-adj.c
+++ b/gcc/combine-stack-adj.c
@@ -567,6 +567,7 @@ combine_stack_adjustments_for_block (basic_block bb)
 	      && try_apply_stack_adjustment (insn, reflist, 0,
 					     -last_sp_adjust))
 	    {
+	      rtx note;
 	      if (last2_sp_set)
 		maybe_move_args_size_note (last2_sp_set, last_sp_set, false);
 	      else
@@ -576,6 +577,11 @@ combine_stack_adjustments_for_block (basic_block bb)
 	      reflist = NULL;
 	      last_sp_set = NULL_RTX;
 	      last_sp_adjust = 0;
+	      /* We no longer adjust stack size.  Whoever adjusted it earlier
+		 hopefully got the note right.  */
+	      note = find_reg_note (insn, REG_ARGS_SIZE, NULL_RTX);
+	      if (note)
+		remove_note (insn, note);
 	      continue;
 	    }
 	}