diff options
| -rw-r--r-- | gcc/ada/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/ada/gcc-interface/decl.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gnat.dg/unchecked_convert3.adb | 22 |
4 files changed, 35 insertions, 1 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index a8ef574..33eb988 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 0c7321d..25c4d81 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 28df5ac..bc3f3d2 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 0000000..1354752 --- /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; |