review round 2

Author: NinaRanns

gcc/cp/contracts.cc

@@ -2730,7 +2730,8 @@ 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);
-      CONTRACT_CONSTIFY_EXPR_P(decl) = true;
+      /* Mark the VCE as contract const wrapper.  */
+      decl->base.private_flag = true;
     }
   return decl;
 }

gcc/cp/cp-tree.h

@@ -3204,12 +3204,6 @@ struct GTY(()) lang_decl {
 #define CONTRACT_HELPER(NODE) \
  (LANG_DECL_FN_CHECK (NODE)->contract_helper)
 
-/* In VIEW_CONVERT_EXPR, set when this node is a const wrapper.  Used to
-   constify entities inside contract assertions.  */
-
-#define CONTRACT_CONSTIFY_EXPR_P(NODE) \
-  (TREE_CHECK(NODE, VIEW_CONVERT_EXPR)->base.private_flag)
-
 /* 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
@@ -9012,19 +9006,17 @@ set_contract_const (tree t, bool constify)
 inline bool
 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
-      && CONTRACT_CONSTIFY_EXPR_P (exp))
-    return true;
-  return false;
+  /* A wrapper node has code VIEW_CONVERT_EXPR, and the flag base.private_flag
+     is set. The wrapper node is used to Used to constify entities inside
+     contract assertions.  */
+  return ((TREE_CODE (exp) == VIEW_CONVERT_EXPR) && exp->base.private_flag);
 }
 
-/* If EXP is a CONTRACT_CONSTIFY_EXPR_P, return the wrapped expression.
+/* If EXP is a contract_const_wrapper_p, return the wrapped expression.
    Otherwise, do nothing. */
 
 inline tree
-strip_contract_constify_expr (tree exp)
+strip_contract_const_wrapper (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&."  */
-      expr = strip_contract_constify_expr (expr);
+      expr = strip_contract_const_wrapper (expr);
 
       if (INDIRECT_REF_P (expr)
 	  || TREE_CODE (expr) == VIEW_CONVERT_EXPR)

gcc/tree-core.h

@@ -1364,7 +1364,7 @@ struct GTY(()) tree_base {
        ENUM_IS_OPAQUE in
 	   ENUMERAL_TYPE
 
-      EXPR_CONTRACT_CONST_WRAPPER_P in
+      contract_const_wrapper_p in
 	   VIEW_CONVERT_EXPR
 
    protected_flag: