commit 0622fce75c30b1cdce32dfa1a6fe96cb34e526ea
author Victor Khimenko <khim@chromium.org> Tue Oct 16 13:48:45 2012
committer Victor Khimenko <khim@chromium.org> Tue Oct 16 13:48:45 2012
tree 9abbe47e2e27b394d2e9c48ffef7fa19203c3ba9
parent 455063da0a22a7a099d80efda2fff25bda15420a

Fix potential out of bounds access.

Merge from http://gcc.gnu.org/viewcvs?view=revision&revision=185787.

Review URL: https://codereview.chromium.org/11177002

gcc/reload1.c

diff --git a/gcc/reload1.c b/gcc/reload1.c
index fcf0bd3..35ead42 100644
--- a/gcc/reload1.c
+++ b/gcc/reload1.c
@@ -1719,11 +1719,12 @@
   int r = reg_renumber[reg];
   int nregs;
 
+  /* Ignore spilled pseudo-registers which can be here only if IRA is used.  */
+  if (ira_conflicts_p && r < 0)
+    return;
+
   if (REGNO_REG_SET_P (&pseudos_counted, reg)
-      || REGNO_REG_SET_P (&spilled_pseudos, reg)
-      /* Ignore spilled pseudo-registers which can be here only if IRA
-	 is used.  */
-      || (ira_conflicts_p && r < 0))
+      || REGNO_REG_SET_P (&spilled_pseudos, reg))
     return;
 
   SET_REGNO_REG_SET (&pseudos_counted, reg);
@@ -1800,12 +1801,17 @@
 {
   int freq = REG_FREQ (reg);
   int r = reg_renumber[reg];
-  int nregs = hard_regno_nregs[r][PSEUDO_REGNO_MODE (reg)];
+  int nregs;
 
-  /* Ignore spilled pseudo-registers which can be here only if IRA is
-     used.  */
-  if ((ira_conflicts_p && r < 0)
-      || REGNO_REG_SET_P (&spilled_pseudos, reg)
+  /* Ignore spilled pseudo-registers which can be here only if IRA is used.  */
+  if (ira_conflicts_p && r < 0)
+    return;
+
+  gcc_assert (r >= 0);
+
+  nregs = hard_regno_nregs[r][PSEUDO_REGNO_MODE (reg)];
+
+  if (REGNO_REG_SET_P (&spilled_pseudos, reg)
       || spilled + spilled_nregs <= r || r + nregs <= spilled)
     return;