[gcc r15-6710] c++: decorate build_nop for -fmem-report

[Jason Merrill via Gcc-cvs]

https://gcc.gnu.org/g:c42261d89538c416464c2191e4c72ec002a43cd0

commit r15-6710-gc42261d89538c416464c2191e4c72ec002a43cd0
Author: Jason Merrill <ja...@redhat.com>
Date:   Mon Dec 23 08:48:11 2024 -0500

    c++: decorate build_nop for -fmem-report
    
    The caller of build_nop seems more interesting than that tiny function
    itself.
    
    gcc/cp/ChangeLog:
    
            * cp-tree.h (build_nop): Add CXX_MEM_STAT_INFO.
            * typeck.cc (build_nop): Add MEM_STAT_DECL.

Diff:
---
 gcc/cp/cp-tree.h | 2 +-
 gcc/cp/typeck.cc | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index 6184d99f4afc..c08494705e9f 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -8438,7 +8438,7 @@ extern tree build_x_shufflevector               
(location_t,
 extern tree build_simple_component_ref         (tree, tree);
 extern tree build_ptrmemfunc_access_expr       (tree, tree);
 extern tree build_address                      (tree);
-extern tree build_nop                          (tree, tree);
+extern tree build_nop                          (tree, tree CXX_MEM_STAT_INFO);
 extern tree non_reference                      (tree);
 extern tree lookup_anon_field                  (tree, tree);
 extern bool invalid_nonstatic_memfn_p          (location_t, tree,
diff --git a/gcc/cp/typeck.cc b/gcc/cp/typeck.cc
index 1f9a74166f48..c3ef9299f599 100644
--- a/gcc/cp/typeck.cc
+++ b/gcc/cp/typeck.cc
@@ -7149,11 +7149,11 @@ build_address (tree t)
 /* Return a NOP_EXPR converting EXPR to TYPE.  */
 
 tree
-build_nop (tree type, tree expr)
+build_nop (tree type, tree expr MEM_STAT_DECL)
 {
   if (type == error_mark_node || error_operand_p (expr))
     return expr;
-  return build1_loc (EXPR_LOCATION (expr), NOP_EXPR, type, expr);
+  return build1_loc (EXPR_LOCATION (expr), NOP_EXPR, type, expr PASS_MEM_STAT);
 }
 
 /* Take the address of ARG, whatever that means under C++ semantics.