review comments

Author: NinaRanns

gcc/cp/contracts.cc

@@ -2730,7 +2730,7 @@ tree view_as_const(tree decl)
       ctype = cp_build_qualified_type (ctype, (cp_type_quals (ctype)
 					       | TYPE_QUAL_CONST));
       decl = build1 (VIEW_CONVERT_EXPR, ctype, decl);
-      EXPR_CONTRACT_CONST_WRAPPER_P(decl) = true;
+      CONTRACT_CONSTIFY_EXPR_P(decl) = true;
     }
   return decl;
 }

gcc/cp/cp-tree.h

@@ -3207,15 +3207,9 @@ struct GTY(()) lang_decl {
 /* In VIEW_CONVERT_EXPR, set when this node is a const wrapper.  Used to
    constify entities inside contract assertions.  */
 
-#define EXPR_CONTRACT_CONST_WRAPPER_P(NODE) \
+#define CONTRACT_CONSTIFY_EXPR_P(NODE) \
   (TREE_CHECK(NODE, VIEW_CONVERT_EXPR)->base.private_flag)
 
-/* Remove any VIEW_CONVERT_EXPR that's used to constify an entity inside a
-   contract assertion.  */
-
-#define STRIP_ANY_CONTRACT_CONST_WRAPPER(EXP) \
-  (EXP) = tree_strip_any_contract_const_wrapper (CONST_CAST_TREE (EXP))
-
 /* For a FUNCTION_DECL or a VAR_DECL, the language linkage for the
    declaration.  Some entities (like a member function in a local
    class, or a local variable) do not have linkage at all, and this
@@ -9021,15 +9015,16 @@ contract_const_wrapper_p (const_tree exp)
   /* A wrapper node has code VIEW_CONVERT_EXPR, and the flag
      EXPR_LOCATION_WRAPPER_P is set.  */
   if (TREE_CODE (exp) == VIEW_CONVERT_EXPR
-      && EXPR_CONTRACT_CONST_WRAPPER_P (exp))
+      && CONTRACT_CONSTIFY_EXPR_P (exp))
     return true;
   return false;
 }
 
-/* Implementation of STRIP_ANY_CONTRACT_CONST_WRAPPER.  */
+/* If EXP is a CONTRACT_CONSTIFY_EXPR_P, return the wrapped expression.
+   Otherwise, do nothing. */
 
 inline tree
-tree_strip_any_contract_const_wrapper (tree exp)
+strip_contract_constify_expr (tree exp)
 {
   if (contract_const_wrapper_p (exp))
     return TREE_OPERAND (exp, 0);

gcc/cp/semantics.cc

@@ -12597,7 +12597,7 @@ finish_decltype_type (tree expr, bool id_expression_or_member_access_p,
 	 strip the const wrapper. Per P2900R14, "For a function f with the
 	 return type T , the result name is an lvalue of type const T , decltype(r)
 	 is T , and decltype((r)) is const T&."  */
-      STRIP_ANY_CONTRACT_CONST_WRAPPER (expr);
+      expr = strip_contract_constify_expr (expr);
 
       if (INDIRECT_REF_P (expr)
 	  || TREE_CODE (expr) == VIEW_CONVERT_EXPR)