diff options
| author | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2019-06-25 08:17:08 +0000 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2019-06-25 08:17:08 +0000 |
| commit | c23524153d2b7b683526969a0d9b85efdc8c2767 (patch) | |
| tree | 6eabb9c78a6660bd71ad8ce27a2b109f4521db25 /gcc | |
| parent | 361af3e4194ce1d9620e2c3506115bba9ef18efa (diff) | |
| download | gcc-c23524153d2b7b683526969a0d9b85efdc8c2767.zip gcc-c23524153d2b7b683526969a0d9b85efdc8c2767.tar.gz gcc-c23524153d2b7b683526969a0d9b85efdc8c2767.tar.bz2 | |
decl.c (gnat_to_gnu_entity): Remove superfluous test in previous change.
* gcc-interface/decl.c (gnat_to_gnu_entity): Remove superfluous test
in previous change.
* gcc-interface/gigi.h (maybe_character_type): Fix formatting.
(maybe_character_value): Likewise.
From-SVN: r272637
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/ChangeLog | 17 | ||||
| -rw-r--r-- | gcc/ada/gcc-interface/decl.c | 3 | ||||
| -rw-r--r-- | gcc/ada/gcc-interface/gigi.h | 6 |
3 files changed, 16 insertions, 10 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 7237dac..fab2f0a 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,9 +1,16 @@ +2019-06-25 Eric Botcazou <ebotcazou@adacore.com> + + * gcc-interface/decl.c (gnat_to_gnu_entity): Remove superfluous test + in previous change. + * gcc-interface/gigi.h (maybe_character_type): Fix formatting. + (maybe_character_value): Likewise. + 2019-06-24 Jan Hubicka <jh@suse.cz> * gcc-interface/decl.c (gnat_to_gnu_entity): Check that type is array or integer prior checking string flag. - * gcc-interface/gigi.h (gnat_signed_type_for, - maybe_character_value): Likewise. + * gcc-interface/gigi.h (maybe_character_type): Likewise. + (maybe_character_value): Likewise. 2019-06-24 Martin Sebor <msebor@redhat.com> @@ -12,15 +19,13 @@ 2019-06-18 Arnaud Charlet <charlet@adacore.com> -PR ada/80590 - + PR ada/80590 * sem_ch5.adb (Analyze_Loop_Statement): Avoid exception propagation during normal processing. 2019-06-17 Arnaud Charlet <charlet@adacore.com> -PR ada/80590 - + PR ada/80590 * exp_ch9.adb (Expand_N_Delay_Relative_Statement): Swap the two conditions to avoid a unnecessary exception propagation in the default case. diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c index df40543..a083816 100644 --- a/gcc/ada/gcc-interface/decl.c +++ b/gcc/ada/gcc-interface/decl.c @@ -1855,8 +1855,7 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, bool definition) = Has_Biased_Representation (gnat_entity); /* Do the same processing for Character subtypes as for types. */ - if ((TREE_CODE (TREE_TYPE (gnu_type)) == INTEGER_TYPE - || TREE_CODE (TREE_TYPE (gnu_type)) == ARRAY_TYPE) + if (TREE_CODE (TREE_TYPE (gnu_type)) == INTEGER_TYPE && TYPE_STRING_FLAG (TREE_TYPE (gnu_type))) { TYPE_NAME (gnu_type) = gnu_entity_name; diff --git a/gcc/ada/gcc-interface/gigi.h b/gcc/ada/gcc-interface/gigi.h index 7254a16..c8eb637 100644 --- a/gcc/ada/gcc-interface/gigi.h +++ b/gcc/ada/gcc-interface/gigi.h @@ -1139,7 +1139,8 @@ static inline tree maybe_character_type (tree type) { if (TREE_CODE (type) == INTEGER_TYPE - && TYPE_STRING_FLAG (type) && !TYPE_UNSIGNED (type)) + && TYPE_STRING_FLAG (type) + && !TYPE_UNSIGNED (type)) type = gnat_unsigned_type_for (type); return type; @@ -1153,7 +1154,8 @@ maybe_character_value (tree expr) tree type = TREE_TYPE (expr); if (TREE_CODE (type) == INTEGER_TYPE - && TYPE_STRING_FLAG (type) && !TYPE_UNSIGNED (type)) + && TYPE_STRING_FLAG (type) + && !TYPE_UNSIGNED (type)) { type = gnat_unsigned_type_for (type); expr = convert (type, expr); |