diff options
| author | Martin Liska <mliska@suse.cz> | 2022-10-08 10:19:23 +0200 |
|---|---|---|
| committer | Martin Liska <mliska@suse.cz> | 2022-10-08 10:19:23 +0200 |
| commit | d9e7934d25da4a78ffef1f738206aa1d897911df (patch) | |
| tree | 1bd1697c14259e095f4b4790946eae7df0c5a2e3 /gcc/ada/gcc-interface/decl.cc | |
| parent | da0970e441345f8349522ff1abac5c223044ebb1 (diff) | |
| parent | 6ffbf87ca66f4ed9cd79cff675fabe2109e46e85 (diff) | |
| download | gcc-d9e7934d25da4a78ffef1f738206aa1d897911df.zip gcc-d9e7934d25da4a78ffef1f738206aa1d897911df.tar.gz gcc-d9e7934d25da4a78ffef1f738206aa1d897911df.tar.bz2 | |
Merge branch 'master' into devel/sphinx
Diffstat (limited to 'gcc/ada/gcc-interface/decl.cc')
| -rw-r--r-- | gcc/ada/gcc-interface/decl.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gcc/ada/gcc-interface/decl.cc b/gcc/ada/gcc-interface/decl.cc index c5a93fb..f8c7698 100644 --- a/gcc/ada/gcc-interface/decl.cc +++ b/gcc/ada/gcc-interface/decl.cc @@ -2279,6 +2279,8 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, bool definition) gnu_index_type, gnu_template_type, NULL_TREE, NULL_TREE, 0, 0); + /* Mark the field specifically for INSTANTIATE_LOAD_IN_EXPR. */ + DECL_DISCRIMINANT_NUMBER (gnu_lb_field) = integer_minus_one_node; Sloc_to_locus (Sloc (gnat_entity), &DECL_SOURCE_LOCATION (gnu_lb_field)); @@ -2287,6 +2289,8 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, bool definition) gnu_index_type, gnu_template_type, NULL_TREE, NULL_TREE, 0, 0); + /* Mark the field specifically for INSTANTIATE_LOAD_IN_EXPR. */ + DECL_DISCRIMINANT_NUMBER (gnu_hb_field) = integer_minus_one_node; Sloc_to_locus (Sloc (gnat_entity), &DECL_SOURCE_LOCATION (gnu_hb_field)); @@ -7694,7 +7698,7 @@ gnat_to_gnu_field (Entity_Id gnat_field, tree gnu_record_type, int packed, if (Ekind (gnat_field) == E_Discriminant) { DECL_DISCRIMINANT_NUMBER (gnu_field) - = UI_To_gnu (Discriminant_Number (gnat_field), sizetype); + = UI_To_gnu (Discriminant_Number (gnat_field), integer_type_node); DECL_INVARIANT_P (gnu_field) = No (Discriminant_Default_Value (gnat_field)); DECL_NONADDRESSABLE_P (gnu_field) = 0; |