From: Joern Rennecke <joern.rennecke@embecosm.com>
Date: Mon, 1 Aug 2011 18:30:29 +0000 (+0000)
Subject: mode-switching.c (optimize_mode_switching): Fix bug in MODE_AFTER handling.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a44250f4ddeaebd81dd799ae549b50751e016ae8;p=gcc.git

mode-switching.c (optimize_mode_switching): Fix bug in MODE_AFTER handling.

        * mode-switching.c (optimize_mode_switching): Fix bug in MODE_AFTER
        handling.

From-SVN: r177068
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f03046ed8a0..f098515ac88 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-01  Joern Rennecke  <joern.rennecke@embecosm.com>
+
+	* mode-switching.c (optimize_mode_switching): Fix bug in MODE_AFTER
+	handling.
+
 2011-08-01  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR target/47766
diff --git a/gcc/mode-switching.c b/gcc/mode-switching.c
index 9b11842781c..7ea241cea7b 100644
--- a/gcc/mode-switching.c
+++ b/gcc/mode-switching.c
@@ -499,6 +499,7 @@ optimize_mode_switching (void)
 	{
 	  struct seginfo *ptr;
 	  int last_mode = no_mode;
+	  bool any_set_required = false;
 	  HARD_REG_SET live_now;
 
 	  REG_SET_TO_HARD_REG_SET (live_now, df_get_live_in (bb));
@@ -527,6 +528,7 @@ optimize_mode_switching (void)
 
 		  if (mode != no_mode && mode != last_mode)
 		    {
+		      any_set_required = true;
 		      last_mode = mode;
 		      ptr = new_seginfo (mode, insn, bb->index, live_now);
 		      add_seginfo (info + bb->index, ptr);
@@ -548,8 +550,10 @@ optimize_mode_switching (void)
 	    }
 
 	  info[bb->index].computing = last_mode;
-	  /* Check for blocks without ANY mode requirements.  */
-	  if (last_mode == no_mode)
+	  /* Check for blocks without ANY mode requirements.
+	     N.B. because of MODE_AFTER, last_mode might still be different
+	     from no_mode.  */
+	  if (!any_set_required)
 	    {
 	      ptr = new_seginfo (no_mode, BB_END (bb), bb->index, live_now);
 	      add_seginfo (info + bb->index, ptr);