From: Eric Botcazou <ebotcazou@adacore.com>
Date: Mon, 12 Jan 2009 19:14:43 +0000 (+0000)
Subject: decl.c (gnat_to_gnu_entity): Really strip only useless conversions around renamed... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3b9c1abd29ba5fe93ba4bcae18c8d324657f5dcb;p=gcc.git

decl.c (gnat_to_gnu_entity): Really strip only useless conversions around renamed objects.

	* gcc-interface/decl.c (gnat_to_gnu_entity) <object>: Really strip
	only useless conversions around renamed objects.

From-SVN: r143303
---

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index a8ef574e7f2..33eb9882392 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-12  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/decl.c (gnat_to_gnu_entity) <object>: Really strip
+	only useless conversions around renamed objects.
+
 2009-01-11  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* gcc-interface/decl.c (gnat_to_gnu_entity) <E_Record_Subtype>: Put
diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c
index 0c7321d07b5..25c4d816b43 100644
--- a/gcc/ada/gcc-interface/decl.c
+++ b/gcc/ada/gcc-interface/decl.c
@@ -843,7 +843,10 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, int definition)
 		    == RECORD_TYPE
 		 && TYPE_IS_PADDING_P (TREE_TYPE (TREE_OPERAND (gnu_expr, 0))))
 		/* Strip useless conversions around the object.  */
-		|| TREE_CODE (gnu_expr) == NOP_EXPR)
+		|| (TREE_CODE (gnu_expr) == NOP_EXPR
+		    && gnat_types_compatible_p
+		       (TREE_TYPE (gnu_expr),
+			TREE_TYPE (TREE_OPERAND (gnu_expr, 0)))))
 	      {
 		gnu_expr = TREE_OPERAND (gnu_expr, 0);
 		gnu_type = TREE_TYPE (gnu_expr);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 28df5ac74e5..bc3f3d2d79f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-12  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/unchecked_convert3.adb: New test.
+
 2009-01-12  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/38794
diff --git a/gcc/testsuite/gnat.dg/unchecked_convert3.adb b/gcc/testsuite/gnat.dg/unchecked_convert3.adb
new file mode 100644
index 00000000000..13547521679
--- /dev/null
+++ b/gcc/testsuite/gnat.dg/unchecked_convert3.adb
@@ -0,0 +1,22 @@
+-- { dg-do run }
+-- { dg-options "-gnatVa" }
+
+with Unchecked_Conversion;
+
+procedure Unchecked_Convert3 is
+
+  type Word is range -(2**15) .. (2**15) - 1;
+  type UWord is mod (2**16);
+
+  function To_Word is new unchecked_conversion (UWord, Word);
+
+  function F return UWord is
+  begin
+    return 65036;
+  end;
+
+  W : Word := To_Word(F);
+
+begin
+  null;
+end;