aboutsummaryrefslogtreecommitdiff
path: root/gcc/ada/exp_ch4.adb
diff options
context:
space:
mode:
authorArnaud Charlet <charlet@gcc.gnu.org>2014-10-17 10:42:41 +0200
committerArnaud Charlet <charlet@gcc.gnu.org>2014-10-17 10:42:41 +0200
commita92230c56ce41b83e1ec67bdaadec26b0eb41de9 (patch)
tree7635a8604e038a607885229eb96aee7a0317ba4e /gcc/ada/exp_ch4.adb
parent38d0d6c854d9fc64b2c52a73af8db8af247eb0b7 (diff)
downloadgcc-a92230c56ce41b83e1ec67bdaadec26b0eb41de9.zip
gcc-a92230c56ce41b83e1ec67bdaadec26b0eb41de9.tar.gz
gcc-a92230c56ce41b83e1ec67bdaadec26b0eb41de9.tar.bz2
[multiple changes]
2014-10-17 Robert Dewar <dewar@adacore.com> * sem_util.adb: Minor reformatting. 2014-10-17 Ed Schonberg <schonberg@adacore.com> * sem_ch12.adb (Build_Function_Wrapper): Build wrappers for actuals that are defaulted subprograms of the formal subprogram declaration. 2014-10-17 Robert Dewar <dewar@adacore.com> * exp_ch4.adb (Expand_N_Op_Eq): Make sure we deal with the implementation base type. * sinfo.ads: Add a note for N_Op_Eq and N_Op_Ne that record operands are always expanded out into component comparisons. 2014-10-17 Robert Dewar <dewar@adacore.com> * s-vallli.adb: Minor comment correction. * s-valuti.ads: Minor comment reformatting. 2014-10-17 Robert Dewar <dewar@adacore.com> * gnat_rm.texi: Document System.Atomic_Counters. * impunit.adb: Add System.Atomic_Counters (s-atocou.ads) to the list of user- accessible units added as children of System. * s-atocou.ads: Update comment. 2014-10-17 Arnaud Charlet <charlet@adacore.com> * s-expmod.ads: Add comments. From-SVN: r216371
Diffstat (limited to 'gcc/ada/exp_ch4.adb')
-rw-r--r--gcc/ada/exp_ch4.adb5
1 files changed, 4 insertions, 1 deletions
diff --git a/gcc/ada/exp_ch4.adb b/gcc/ada/exp_ch4.adb
index 9068fdc..5fdba53 100644
--- a/gcc/ada/exp_ch4.adb
+++ b/gcc/ada/exp_ch4.adb
@@ -7152,7 +7152,10 @@ package body Exp_Ch4 is
return;
end if;
- Typl := Base_Type (Typl);
+ -- Now get the implementation base type (note that plain Base_Type here
+ -- might lead us back to the private type, which is not what we want!)
+
+ Typl := Implementation_Base_Type (Typl);
-- Equality between variant records results in a call to a routine
-- that has conditional tests of the discriminant value(s), and hence