From: Mikael Morin <mikael@gcc.gnu.org>
Date: Thu, 3 Nov 2011 21:24:24 +0000 (+0000)
Subject: trans-array.c (gfc_trans_array_bound_check): Use ss argument to get name.
X-Git-Tag: releases/gcc-4.7.0~2575
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14bf3267a653e835acc208a30142cf6b2f9e2a09;p=thirdparty%2Fgcc.git

trans-array.c (gfc_trans_array_bound_check): Use ss argument to get name.

	* trans-array.c (gfc_trans_array_bound_check): Use ss argument
	to get name.

From-SVN: r180858
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index f2640956629a..a7d0680dcf6d 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-03  Mikael Morin  <mikael@gcc.gnu.org>
+
+	* trans-array.c (gfc_trans_array_bound_check): Use ss argument
+	to get name.
+
 2011-11-03  Mikael Morin  <mikael@gcc.gnu.org>
 
 	* trans-array.c (gfc_trans_array_bound_check,
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index 45bf6836f5b2..d8f5448ff878 100644
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -2443,28 +2443,8 @@ trans_array_bound_check (gfc_se * se, gfc_ss *ss, tree index, int n,
   index = gfc_evaluate_now (index, &se->pre);
 
   /* We find a name for the error message.  */
-  if (se->ss)
-    name = se->ss->expr->symtree->name;
-
-  if (!name && se->loop && se->loop->ss && se->loop->ss->expr
-      && se->loop->ss->expr->symtree)
-    name = se->loop->ss->expr->symtree->name;
-
-  if (!name && se->loop && se->loop->ss && se->loop->ss->loop_chain
-      && se->loop->ss->loop_chain->expr
-      && se->loop->ss->loop_chain->expr->symtree)
-    name = se->loop->ss->loop_chain->expr->symtree->name;
-
-  if (!name && se->loop && se->loop->ss && se->loop->ss->expr)
-    {
-      if (se->loop->ss->expr->expr_type == EXPR_FUNCTION
-	  && se->loop->ss->expr->value.function.name)
-	name = se->loop->ss->expr->value.function.name;
-      else
-	if (se->loop->ss->type == GFC_SS_CONSTRUCTOR
-	    || se->loop->ss->type == GFC_SS_SCALAR)
-	  name = "unnamed constant";
-    }
+  name = ss->expr->symtree->n.sym->name;
+  gcc_assert (name != NULL);
 
   if (TREE_CODE (descriptor) == VAR_DECL)
     name = IDENTIFIER_POINTER (DECL_NAME (descriptor));