diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b6383aa46914fdf7865773b207a051529651127c..df787e1be1e5dafe92b1f80555510862d16867db 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2016-11-29  Jeff Law  <law@redhat.com>
+
+	* lra-constraints.c (check_and_process_move): Constrain the
+	range of DCLASS and SCLASS to avoid false positive out of bounds
+	array index warning.
+
 2016-11-29  David Malcolm  <dmalcolm@redhat.com>
 
 	* doc/install.texi (--with-target-bdw-gc): Remove stray '@'.
diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c
index 133b55ce0ba48f7924af722039ff8380c8934b2e..7784ad29744b1e43d282c92a33ede2a48ebf382f 100644
--- a/gcc/lra-constraints.c
+++ b/gcc/lra-constraints.c
@@ -1150,6 +1150,7 @@ check_and_process_move (bool *change_p, bool *sec_mem_p ATTRIBUTE_UNUSED)
   sclass = dclass = NO_REGS;
   if (REG_P (dreg))
     dclass = get_reg_class (REGNO (dreg));
+  gcc_assert (dclass < LIM_REG_CLASSES);
   if (dclass == ALL_REGS)
     /* ALL_REGS is used for new pseudos created by transformations
        like reload of SUBREG_REG (see function
@@ -1161,6 +1162,7 @@ check_and_process_move (bool *change_p, bool *sec_mem_p ATTRIBUTE_UNUSED)
     return false;
   if (REG_P (sreg))
     sclass = get_reg_class (REGNO (sreg));
+  gcc_assert (sclass < LIM_REG_CLASSES);
   if (sclass == ALL_REGS)
     /* See comments above.  */
     return false;