From 1572e2c3278eadcf3f22a0731e7530667072d45c Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Thu, 30 Oct 2014 12:45:03 +0100 Subject: [PATCH] Re-commit wrongly reverted previous change. From-SVN: r216922 --- gcc/ada/gcc-interface/decl.c | 8 +++----- gcc/ada/gcc-interface/misc.c | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c index ed50294f2ba..05be419ce94 100644 --- a/gcc/ada/gcc-interface/decl.c +++ b/gcc/ada/gcc-interface/decl.c @@ -2486,16 +2486,14 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, int definition) /* We need special types for debugging information to point to the index types if they have variable bounds, are not integer - types, are biased or are wider than sizetype. */ - if (!integer_onep (gnu_orig_min) + types or are biased. */ + if (TREE_CODE (gnu_orig_min) != INTEGER_CST || TREE_CODE (gnu_orig_max) != INTEGER_CST || TREE_CODE (gnu_index_type) != INTEGER_TYPE || (TREE_TYPE (gnu_index_type) && TREE_CODE (TREE_TYPE (gnu_index_type)) != INTEGER_TYPE) - || TYPE_BIASED_REPRESENTATION_P (gnu_index_type) - || compare_tree_int (rm_size (gnu_index_type), - TYPE_PRECISION (sizetype)) > 0) + || TYPE_BIASED_REPRESENTATION_P (gnu_index_type)) need_index_type_struct = true; } diff --git a/gcc/ada/gcc-interface/misc.c b/gcc/ada/gcc-interface/misc.c index 4510cd141c3..fe28e9697ae 100644 --- a/gcc/ada/gcc-interface/misc.c +++ b/gcc/ada/gcc-interface/misc.c @@ -238,6 +238,7 @@ gnat_init_options (unsigned int decoded_options_count, #undef flag_compare_debug #undef flag_short_enums #undef flag_stack_check +int gnat_encodings = 0; int optimize; int optimize_size; int flag_compare_debug;