From: Alan Modra <amodra@gmail.com>
Date: Fri, 4 Nov 2011 21:05:46 +0000 (+1030)
Subject: reload1.c (gen_reload): Don't use REGNO on SUBREGs.
X-Git-Tag: releases/gcc-4.7.0~2473
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c62c54419cf1bcdebbe2313b509e1892b85832d0;p=thirdparty%2Fgcc.git

reload1.c (gen_reload): Don't use REGNO on SUBREGs.

	* reload1.c (gen_reload): Don't use REGNO on SUBREGs.
	* print-rtl.c (print_rtx): Don't segfault on negative regno.

From-SVN: r180983
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 438e33c0da1f..2b9e5b35d18e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-05  Alan Modra  <amodra@gmail.com>
+
+	* reload1.c (gen_reload): Don't use REGNO on SUBREGs.
+	* print-rtl.c (print_rtx): Don't segfault on negative regno.
+
 2011-11-03  David S. Miller  <davem@davemloft.net>
 
 	PR target/49965
diff --git a/gcc/print-rtl.c b/gcc/print-rtl.c
index db9c0fbbdd0b..edeeefa6071c 100644
--- a/gcc/print-rtl.c
+++ b/gcc/print-rtl.c
@@ -466,11 +466,10 @@ print_rtx (const_rtx in_rtx)
 	    const char *name;
 
 #ifndef GENERATOR_FILE
-	    if (REG_P (in_rtx) && value < FIRST_PSEUDO_REGISTER)
-	      fprintf (outfile, " %d %s", REGNO (in_rtx),
-		       reg_names[REGNO (in_rtx)]);
+	    if (REG_P (in_rtx) && (unsigned) value < FIRST_PSEUDO_REGISTER)
+	      fprintf (outfile, " %d %s", value, reg_names[value]);
 	    else if (REG_P (in_rtx)
-		     && value <= LAST_VIRTUAL_REGISTER)
+		     && (unsigned) value <= LAST_VIRTUAL_REGISTER)
 	      {
 		if (value == VIRTUAL_INCOMING_ARGS_REGNUM)
 		  fprintf (outfile, " %d virtual-incoming-args", value);
diff --git a/gcc/reload1.c b/gcc/reload1.c
index 04a839ede7b9..c9fb57baa4cc 100644
--- a/gcc/reload1.c
+++ b/gcc/reload1.c
@@ -8601,10 +8601,10 @@ gen_reload (rtx out, rtx in, int opnum, enum reload_type type)
       rtx loc = get_secondary_mem (in, GET_MODE (out), opnum, type);
 
       if (GET_MODE (loc) != GET_MODE (out))
-	out = gen_rtx_REG (GET_MODE (loc), REGNO (out));
+	out = gen_rtx_REG (GET_MODE (loc), reg_or_subregno (out));
 
       if (GET_MODE (loc) != GET_MODE (in))
-	in = gen_rtx_REG (GET_MODE (loc), REGNO (in));
+	in = gen_rtx_REG (GET_MODE (loc), reg_or_subregno (in));
 
       gen_reload (loc, in, opnum, type);
       gen_reload (out, loc, opnum, type);