From 03b4b15ec70e28f945fab896d4574e3953fa2272 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Tue, 17 Jul 2018 08:11:22 +0000 Subject: [PATCH] [Ada] ICE on renaming of result of binary operation 2018-07-17 Eric Botcazou gcc/ada/ * gcc-interface/decl.c (gnat_to_gnu_entity) : Deal with more rvalues in the expression of a renaming. From-SVN: r262793 --- gcc/ada/ChangeLog | 5 +++++ gcc/ada/gcc-interface/decl.c | 11 +++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 99ae0ea67b3..ae2ab5dfce6 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2018-07-17 Eric Botcazou + + * gcc-interface/decl.c (gnat_to_gnu_entity) : Deal with + more rvalues in the expression of a renaming. + 2018-07-17 Eric Botcazou * gcc-interface/ada-tree.h (TYPE_RETURN_BY_DIRECT_REF_P): Define for diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c index 123fefb3131..50d20e6e8ea 100644 --- a/gcc/ada/gcc-interface/decl.c +++ b/gcc/ada/gcc-interface/decl.c @@ -969,8 +969,7 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, bool definition) function call is a constant object. Therefore, it can be the inner object of a constant renaming and the renaming must be fully instantiated, i.e. it cannot be a reference to (part of) - an existing object. And treat other rvalues (addresses, null - expressions, constructors and literals) the same way. */ + an existing object. And treat other rvalues the same way. */ tree inner = gnu_expr; while (handled_component_p (inner) || CONVERT_EXPR_P (inner)) inner = TREE_OPERAND (inner, 0); @@ -981,11 +980,11 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, bool definition) inner = TREE_OPERAND (inner, 1); if ((TREE_CODE (inner) == CALL_EXPR && !call_is_atomic_load (inner)) - || TREE_CODE (inner) == ADDR_EXPR - || TREE_CODE (inner) == NULL_EXPR - || TREE_CODE (inner) == PLUS_EXPR || TREE_CODE (inner) == CONSTRUCTOR || CONSTANT_CLASS_P (inner) + || COMPARISON_CLASS_P (inner) + || BINARY_CLASS_P (inner) + || EXPRESSION_CLASS_P (inner) /* We need to detect the case where a temporary is created to hold the return value, since we cannot safely rename it at top level as it lives only in the elaboration routine. */ @@ -1007,7 +1006,7 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, bool definition) underlying object lives only in the elaboration routine. */ || (TREE_CODE (inner) == INDIRECT_REF && (inner - = remove_conversions (TREE_OPERAND (inner, 0), true)) + = remove_conversions (TREE_OPERAND (inner, 0), true)) && TREE_CODE (inner) == VAR_DECL && DECL_RETURN_VALUE_P (inner))) ; -- 2.30.2