[gcc r12-3562] c++: Small location tweak

Jason Merrill jason@gcc.gnu.org
Thu Sep 16 03:48:36 GMT 2021


https://gcc.gnu.org/g:8d970817a5892b6bb4634499d47f6d2ee7d46e4c

commit r12-3562-g8d970817a5892b6bb4634499d47f6d2ee7d46e4c
Author: Jason Merrill <jason@redhat.com>
Date:   Wed Sep 15 19:01:14 2021 -0400

    c++: Small location tweak
    
    As Marek suggested.
    
    gcc/cp/ChangeLog:
    
            * constexpr.c (cxx_eval_outermost_constant_expr): Use
            protected_set_expr_location.

Diff:
---
 gcc/cp/constexpr.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index d3c075c5ab8..8a5dd067bcb 100644
--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -7502,8 +7502,7 @@ cxx_eval_outermost_constant_expr (tree t, bool allow_non_constant,
 
   /* Remember the original location if that wouldn't need a wrapper.  */
   if (location_t loc = EXPR_LOCATION (t))
-    if (CAN_HAVE_LOCATION_P (r))
-      SET_EXPR_LOCATION (r, loc);
+    protected_set_expr_location (r, loc);
 
   return r;
 }


More information about the Gcc-cvs mailing list