https://gcc.gnu.org/g:51900e71977e8bcb002e7c46ce44be46aa55cea4

commit 51900e71977e8bcb002e7c46ce44be46aa55cea4
Author: Mikael Morin <mik...@gcc.gnu.org>
Date:   Wed Jul 16 16:49:28 2025 +0200

    Extraction fonction gfc_nullify_descriptor

Diff:
---
 gcc/fortran/trans-descriptor.cc | 8 ++++++++
 gcc/fortran/trans-descriptor.h  | 3 +++
 gcc/fortran/trans-expr.cc       | 2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/gcc/fortran/trans-descriptor.cc b/gcc/fortran/trans-descriptor.cc
index 76997a28f0bb..434091d399e9 100644
--- a/gcc/fortran/trans-descriptor.cc
+++ b/gcc/fortran/trans-descriptor.cc
@@ -26,6 +26,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "trans.h"
 #include "trans-const.h"
 #include "trans-types.h"
+#include "trans-array.h"
 
 
 
/******************************************************************************/
@@ -685,3 +686,10 @@ gfc_conv_descriptor_cosize (tree desc, int rank, int 
corank)
 {
   return gfc_conv_descriptor_size_1 (desc, rank, rank + corank - 1);
 }
+
+
+void
+gfc_nullify_descriptor (stmtblock_t *block, tree descr)
+{
+  gfc_conv_descriptor_data_set (block, descr, null_pointer_node); 
+}
diff --git a/gcc/fortran/trans-descriptor.h b/gcc/fortran/trans-descriptor.h
index c035ec638edd..2328d0dad6f6 100644
--- a/gcc/fortran/trans-descriptor.h
+++ b/gcc/fortran/trans-descriptor.h
@@ -96,4 +96,7 @@ gfc_get_descriptor_offsets_for_info (const_tree desc_type, 
tree *data_off,
                                     tree *stride_suboff, tree *lower_suboff,
                                     tree *upper_suboff);
 
+/* Build a null array descriptor constructor.  */
+void gfc_nullify_descriptor (stmtblock_t *block, tree);
+
 #endif /* GFC_TRANS_DESCRIPTOR_H */
diff --git a/gcc/fortran/trans-expr.cc b/gcc/fortran/trans-expr.cc
index 4cd09e45fcd9..39cdaa3115bb 100644
--- a/gcc/fortran/trans-expr.cc
+++ b/gcc/fortran/trans-expr.cc
@@ -11053,7 +11053,7 @@ gfc_trans_pointer_assignment (gfc_expr * expr1, 
gfc_expr * expr2)
       if (expr2->expr_type == EXPR_NULL)
        {
          /* Just set the data pointer to null.  */
-         gfc_conv_descriptor_data_set (&lse.pre, lse.expr, null_pointer_node);
+         gfc_nullify_descriptor (&lse.pre, lse.expr);
        }
       else if (rank_remap)
        {

Reply via email to