Re-commit wrongly reverted previous change.

From-SVN: r216922
This commit is contained in:
Arnaud Charlet 2014-10-30 12:45:03 +01:00
parent cd2c602730
commit 1572e2c327
2 changed files with 4 additions and 5 deletions

View File

@ -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 /* We need special types for debugging information to point to
the index types if they have variable bounds, are not integer the index types if they have variable bounds, are not integer
types, are biased or are wider than sizetype. */ types or are biased. */
if (!integer_onep (gnu_orig_min) if (TREE_CODE (gnu_orig_min) != INTEGER_CST
|| TREE_CODE (gnu_orig_max) != INTEGER_CST || TREE_CODE (gnu_orig_max) != INTEGER_CST
|| TREE_CODE (gnu_index_type) != INTEGER_TYPE || TREE_CODE (gnu_index_type) != INTEGER_TYPE
|| (TREE_TYPE (gnu_index_type) || (TREE_TYPE (gnu_index_type)
&& TREE_CODE (TREE_TYPE (gnu_index_type)) && TREE_CODE (TREE_TYPE (gnu_index_type))
!= INTEGER_TYPE) != INTEGER_TYPE)
|| TYPE_BIASED_REPRESENTATION_P (gnu_index_type) || TYPE_BIASED_REPRESENTATION_P (gnu_index_type))
|| compare_tree_int (rm_size (gnu_index_type),
TYPE_PRECISION (sizetype)) > 0)
need_index_type_struct = true; need_index_type_struct = true;
} }

View File

@ -238,6 +238,7 @@ gnat_init_options (unsigned int decoded_options_count,
#undef flag_compare_debug #undef flag_compare_debug
#undef flag_short_enums #undef flag_short_enums
#undef flag_stack_check #undef flag_stack_check
int gnat_encodings = 0;
int optimize; int optimize;
int optimize_size; int optimize_size;
int flag_compare_debug; int flag_compare_debug;