From: Eric Botcazou <ebotcazou@adacore.com>
Date: Tue, 28 Jun 2011 21:56:48 +0000 (+0000)
Subject: * tree-ssa-dom.c (initialize_hash_element): Fix oversight.
X-Git-Tag: releases/gcc-4.5.4~570
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1827b329bba9e8244c09dbf558be18257c34c700;p=thirdparty%2Fgcc.git

* tree-ssa-dom.c (initialize_hash_element): Fix oversight.

From-SVN: r175602
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 896b560acf75..e21f3750672e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2011-06-28  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* tree-ssa-dom.c (initialize_hash_element): Fix oversight.
+
 2011-06-17  Hans-Peter Nilsson  <hp@axis.com>
 
 	Backport from mainline
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ee72cd1c0664..2f86305b65df 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2011-06-28  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/opt17.ad[sb]: New test.
+
 2011-06-23  Jason Merrill  <jason@redhat.com>
 
 	PR c++/49440
diff --git a/gcc/testsuite/gnat.dg/opt17.adb b/gcc/testsuite/gnat.dg/opt17.adb
new file mode 100644
index 000000000000..361f7607b883
--- /dev/null
+++ b/gcc/testsuite/gnat.dg/opt17.adb
@@ -0,0 +1,13 @@
+-- { dg-do compile }
+-- { dg-options "-O" }
+
+package body Opt17 is
+
+  function Func return S is
+    V : String (1 .. 6);
+  begin
+    V (1 .. 3) := "ABC";
+    return V (1 .. 5);
+  end;
+
+end Opt17;
diff --git a/gcc/testsuite/gnat.dg/opt17.ads b/gcc/testsuite/gnat.dg/opt17.ads
new file mode 100644
index 000000000000..601c2f201c8d
--- /dev/null
+++ b/gcc/testsuite/gnat.dg/opt17.ads
@@ -0,0 +1,7 @@
+package Opt17 is
+
+  subtype S is String (1 .. 5);
+
+  function Func return S;
+
+end Opt17;
diff --git a/gcc/tree-ssa-dom.c b/gcc/tree-ssa-dom.c
index 8b799a3bd1f4..1b67ccddc2b6 100644
--- a/gcc/tree-ssa-dom.c
+++ b/gcc/tree-ssa-dom.c
@@ -215,6 +215,7 @@ initialize_hash_element (gimple stmt, tree lhs,
         {
         case GIMPLE_SINGLE_RHS:
           expr->kind = EXPR_SINGLE;
+	  expr->type = TREE_TYPE (gimple_assign_lhs (stmt));
           expr->ops.single.rhs = gimple_assign_rhs1 (stmt);
           break;
         case GIMPLE_UNARY_RHS: