From 77011afe7fa44deb834e70ea536d533a8b4b8382 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 19 Jul 2017 17:55:47 +0200 Subject: [PATCH] ada-tree.h (TYPE_OBJECT_RECORD_TYPE, [...]): Use TYPE_MIN_VALUE_RAW instead of TYPE_MINVAL. * gcc-interface/ada-tree.h (TYPE_OBJECT_RECORD_TYPE, TYPE_GCC_MIN_VALUE): Use TYPE_MIN_VALUE_RAW instead of TYPE_MINVAL. (TYPE_GCC_MAX_VALUE): Use TYPE_MAX_VALUE_RAW instead of TYPE_MAXVAL. From-SVN: r250355 --- gcc/ada/ChangeLog | 8 +++++++- gcc/ada/gcc-interface/ada-tree.h | 9 ++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 5bd260f7b38..6abf1f27cc5 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,6 +1,12 @@ +2017-07-19 Jakub Jelinek + + * gcc-interface/ada-tree.h (TYPE_OBJECT_RECORD_TYPE, + TYPE_GCC_MIN_VALUE): Use TYPE_MIN_VALUE_RAW instead of TYPE_MINVAL. + (TYPE_GCC_MAX_VALUE): Use TYPE_MAX_VALUE_RAW instead of TYPE_MAXVAL. + 2017-07-18 Mike Frysinger - * gcc-interface/Makefile.in ($(P)): Delete + * gcc-interface/Makefile.in ($(P)): Delete. 2017-07-15 John Paul Adrian Glaubitz diff --git a/gcc/ada/gcc-interface/ada-tree.h b/gcc/ada/gcc-interface/ada-tree.h index 511a0bd8173..2470c83c901 100644 --- a/gcc/ada/gcc-interface/ada-tree.h +++ b/gcc/ada/gcc-interface/ada-tree.h @@ -209,21 +209,24 @@ do { \ this is a conflict on the minval field, but there doesn't seem to be simple fix, so we'll live with this kludge for now. */ #define TYPE_OBJECT_RECORD_TYPE(NODE) \ - (TYPE_MINVAL (TREE_CHECK2 ((NODE), UNCONSTRAINED_ARRAY_TYPE, ENUMERAL_TYPE))) + (TYPE_MIN_VALUE_RAW (TREE_CHECK2 ((NODE), UNCONSTRAINED_ARRAY_TYPE, \ + ENUMERAL_TYPE))) /* For numerical types, this is the GCC lower bound of the type. The GCC type system is based on the invariant that an object X of a given type cannot hold at run time a value smaller than its lower bound; otherwise the behavior is undefined. The optimizer takes advantage of this and considers that the assertion X >= LB is always true. */ -#define TYPE_GCC_MIN_VALUE(NODE) (TYPE_MINVAL (NUMERICAL_TYPE_CHECK (NODE))) +#define TYPE_GCC_MIN_VALUE(NODE) \ + (TYPE_MIN_VALUE_RAW (NUMERICAL_TYPE_CHECK (NODE))) /* For numerical types, this is the GCC upper bound of the type. The GCC type system is based on the invariant that an object X of a given type cannot hold at run time a value larger than its upper bound; otherwise the behavior is undefined. The optimizer takes advantage of this and considers that the assertion X <= UB is always true. */ -#define TYPE_GCC_MAX_VALUE(NODE) (TYPE_MAXVAL (NUMERICAL_TYPE_CHECK (NODE))) +#define TYPE_GCC_MAX_VALUE(NODE) \ + (TYPE_MAX_VALUE_RAW (NUMERICAL_TYPE_CHECK (NODE))) /* For a FUNCTION_TYPE, if the subprogram has parameters passed by copy in/ copy out, this is the list of nodes used to specify the return values of -- 2.30.2