aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Botcazou <ebotcazou@gcc.gnu.org>2020-06-23 17:44:43 +0200
committerEric Botcazou <ebotcazou@gcc.gnu.org>2020-06-23 18:35:46 +0200
commitcd42cdc225a905cb1eb38dfad453e654261a659e (patch)
treef2cb099eefd418438d22cb1c1da6b128451dc518
parentfa0588dbec38b46d88f46229e2f2b94d16ab09ba (diff)
downloadgcc-cd42cdc225a905cb1eb38dfad453e654261a659e.zip
gcc-cd42cdc225a905cb1eb38dfad453e654261a659e.tar.gz
gcc-cd42cdc225a905cb1eb38dfad453e654261a659e.tar.bz2
Minor cleanup in elaborate_expression
gcc/ada/ChangeLog: * gcc-interface/decl.c (elaborate_expression): Replace calls to Is_OK_Static_Expression with Compile_Time_Known_Value.
-rw-r--r--gcc/ada/gcc-interface/decl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c
index 589154b..63118be 100644
--- a/gcc/ada/gcc-interface/decl.c
+++ b/gcc/ada/gcc-interface/decl.c
@@ -6774,13 +6774,13 @@ elaborate_expression (Node_Id gnat_expr, Entity_Id gnat_entity, const char *s,
/* If we don't need a value and this is static or a discriminant,
we don't need to do anything. */
if (!need_value
- && (Is_OK_Static_Expression (gnat_expr)
+ && (Compile_Time_Known_Value (gnat_expr)
|| (Nkind (gnat_expr) == N_Identifier
&& Ekind (Entity (gnat_expr)) == E_Discriminant)))
return NULL_TREE;
/* If it's a static expression, we don't need a variable for debugging. */
- if (need_debug && Is_OK_Static_Expression (gnat_expr))
+ if (need_debug && Compile_Time_Known_Value (gnat_expr))
need_debug = false;
/* Otherwise, convert this tree to its GCC equivalent and elaborate it. */