From e5aa8dd31e0abac5dcfb3da086ff8a5316ea3fc0 Mon Sep 17 00:00:00 2001 From: Robert Dewar Date: Wed, 19 Dec 2007 17:23:43 +0100 Subject: [PATCH] exp_pakd.adb (Expand_Bit_Packed_Element_Set): Fix packed array type in complex case where array is Volatile. 2007-12-19 Robert Dewar * exp_pakd.adb (Expand_Bit_Packed_Element_Set): Fix packed array type in complex case where array is Volatile. From-SVN: r131075 --- gcc/ada/exp_pakd.adb | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/gcc/ada/exp_pakd.adb b/gcc/ada/exp_pakd.adb index 9a753def146..f3ead191c96 100644 --- a/gcc/ada/exp_pakd.adb +++ b/gcc/ada/exp_pakd.adb @@ -1430,8 +1430,20 @@ package body Exp_Pakd is end if; end if; - New_Lhs := Duplicate_Subexpr (Obj, True); - New_Rhs := Duplicate_Subexpr_No_Checks (Obj); + -- Now create copies removing side effects. Note that in some + -- complex cases, this may cause the fact that we have already + -- set a packed array type on Obj to get lost. So we save the + -- type of Obj, and make sure it is reset properly. + + declare + T : constant Entity_Id := Etype (Obj); + begin + New_Lhs := Duplicate_Subexpr (Obj, True); + New_Rhs := Duplicate_Subexpr_No_Checks (Obj); + Set_Etype (Obj, T); + Set_Etype (New_Lhs, T); + Set_Etype (New_Rhs, T); + end; -- First we deal with the "and" -- 2.30.2