diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2012-01-21 14:58:33 +0000 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2012-01-21 14:58:33 +0000 |
| commit | 7eeb2aa717484ca0055e2274f50a49bc9565d1eb (patch) | |
| tree | 2ffb84bf4d4a6e8715c3955d4a047ef199311ac7 | |
| parent | 188229eb535a47b63c33dc12c71bf0575b44ce17 (diff) | |
| download | gcc-7eeb2aa717484ca0055e2274f50a49bc9565d1eb.zip gcc-7eeb2aa717484ca0055e2274f50a49bc9565d1eb.tar.gz gcc-7eeb2aa717484ca0055e2274f50a49bc9565d1eb.tar.bz2 | |
re PR ada/46192 (wrong code for renaming of volatile packed array with address clause)
PR ada/46192
* gcc-interface/decl.c (gnat_to_gnu_entity) <object>: In the case of a
renaming, preserve the volatileness through the indirection, if any.
From-SVN: r183365
| -rw-r--r-- | gcc/ada/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/ada/gcc-interface/decl.c | 8 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gnat.dg/renaming5.adb | 30 | ||||
| -rw-r--r-- | gcc/testsuite/gnat.dg/renaming5.ads | 5 |
5 files changed, 53 insertions, 0 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 1960e1a..a961439 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,9 @@ +2012-01-21 Eric Botcazou <ebotcazou@adacore.com> + + PR ada/46192 + * gcc-interface/decl.c (gnat_to_gnu_entity) <object>: In the case of a + renaming, preserve the volatileness through the indirection, if any. + 2012-01-14 Andreas Schwab <schwab@linux-m68k.org> * gcc-interface/Makefile.in (OSCONS_EXTRACT): Add diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c index 89a6a2e..9d81ade 100644 --- a/gcc/ada/gcc-interface/decl.c +++ b/gcc/ada/gcc-interface/decl.c @@ -1051,6 +1051,14 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, int definition) entity is always accessed indirectly through it. */ else { + /* We need to preserve the volatileness of the renamed + object through the indirection. */ + if (TREE_THIS_VOLATILE (gnu_expr) + && !TYPE_VOLATILE (gnu_type)) + gnu_type + = build_qualified_type (gnu_type, + (TYPE_QUALS (gnu_type) + | TYPE_QUAL_VOLATILE)); gnu_type = build_reference_type (gnu_type); inner_const_flag = TREE_READONLY (gnu_expr); const_flag = true; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index dee0f80..7d3d095 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2012-01-21 Eric Botcazou <ebotcazou@adacore.com> + + * gnat.dg/renaming5.ad[sb]: New test. + 2012-01-20 Jason Merrill <jason@redhat.com> PR c++/51919 diff --git a/gcc/testsuite/gnat.dg/renaming5.adb b/gcc/testsuite/gnat.dg/renaming5.adb new file mode 100644 index 0000000..25374fe --- /dev/null +++ b/gcc/testsuite/gnat.dg/renaming5.adb @@ -0,0 +1,30 @@ +-- PR ada/46192 +-- Testcase by Rolf Ebert <rolf.ebert.gcc@gmx.de> + +-- { dg-do compile } +-- { dg-options "-O2 -fdump-tree-optimized" } + +with System; use System; + +package body Renaming5 is + + type Bits_In_Byte is array (0 .. 7) of Boolean; + pragma Pack (Bits_In_Byte); + + A : Bits_In_Byte; + for A'Address use System'To_Address(16#c0#); + pragma Volatile (A); + + B : Bits_In_Byte renames A; + + procedure Proc is + begin + while B (0) = False loop + null; + end loop; + end; + +end Renaming5; + +-- { dg-final { scan-tree-dump-times "goto" 2 "optimized" } } +-- { dg-final { cleanup-tree-dump "optimized" } } diff --git a/gcc/testsuite/gnat.dg/renaming5.ads b/gcc/testsuite/gnat.dg/renaming5.ads new file mode 100644 index 0000000..2b39663 --- /dev/null +++ b/gcc/testsuite/gnat.dg/renaming5.ads @@ -0,0 +1,5 @@ +package Renaming5 is + + procedure Proc; + +end Renaming5; |