From 35f467653238c6a37c6a3ef117ce7a7743d6aa1e Mon Sep 17 00:00:00 2001 From: ebotcazou Date: Sun, 18 Dec 2011 14:41:00 +0000 Subject: [PATCH] * gcc-interface/decl.c (gnat_to_gnu_param): Add comment about double reference and DECL_POINTS_TO_READONLY_P. * gcc-interface/trans.c (Identifier_to_gnu) : Always set the TREE_READONLY flag on the first dereference of a double dereference. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@182460 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ada/ChangeLog | 7 +++++++ gcc/ada/gcc-interface/decl.c | 4 ++++ gcc/ada/gcc-interface/trans.c | 5 +++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 5c936f2..0533f9c 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,10 @@ +2011-12-18 Eric Botcazou + + * gcc-interface/decl.c (gnat_to_gnu_param): Add comment about double + reference and DECL_POINTS_TO_READONLY_P. + * gcc-interface/trans.c (Identifier_to_gnu) : Always set the + TREE_READONLY flag on the first dereference of a double dereference. + 2011-12-15 Arnaud Charlet * a-numaux-vms.ads, s-asthan-vms-ia64.adb, s-auxdec-vms-ia64.adb, diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c index c3774f2..89a6a2e 100644 --- a/gcc/ada/gcc-interface/decl.c +++ b/gcc/ada/gcc-interface/decl.c @@ -5587,6 +5587,10 @@ gnat_to_gnu_param (Entity_Id gnat_param, Mechanism_Type mech, DECL_BY_COMPONENT_PTR_P (gnu_param) = by_component_ptr; DECL_BY_DESCRIPTOR_P (gnu_param) = (mech == By_Descriptor || mech == By_Short_Descriptor); + /* Note that, in case of a parameter passed by double reference, the + DECL_POINTS_TO_READONLY_P flag is meant for the second reference. + The first reference always points to read-only, as it points to + the second reference, i.e. the reference to the actual parameter. */ DECL_POINTS_TO_READONLY_P (gnu_param) = (ro_param && (by_ref || by_component_ptr)); DECL_CAN_NEVER_BE_NULL_P (gnu_param) = Can_Never_Be_Null (gnat_param); diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c index da1a8f1..3640782 100644 --- a/gcc/ada/gcc-interface/trans.c +++ b/gcc/ada/gcc-interface/trans.c @@ -1038,8 +1038,9 @@ Identifier_to_gnu (Node_Id gnat_node, tree *gnu_result_type_p) if (TREE_CODE (gnu_result) == INDIRECT_REF) TREE_THIS_NOTRAP (gnu_result) = 1; - if (read_only) - TREE_READONLY (gnu_result) = 1; + /* The first reference, in case of a double reference, always points + to read-only, see gnat_to_gnu_param for the rationale. */ + TREE_READONLY (gnu_result) = 1; } /* If it's a PARM_DECL to foreign convention subprogram, convert it. */ -- 2.7.4