c++, contracts: Fix up constification of out-of-class defs.

Add a missing const-ification case.

Signed-off-by: Iain Sandoe <[email protected]>

Author: iains

gcc/cp/parser.cc

@@ -31511,6 +31511,12 @@ cp_parser_contract_attribute_spec (cp_parser *parser, tree attribute,
 	should_constify = false;
       flag_contracts_nonattr_noconst = !should_constify;
 
+      /* If we have a current class object, see if we need to consider
+	 it const when processing the contract condition.  */
+      tree current_class_ref_copy = current_class_ref;
+      if (flag_contracts_nonattr && should_constify && current_class_ref_copy)
+	current_class_ref = view_as_const (current_class_ref_copy);
+
       /* Parse the condition, ensuring that parameters or the return variable
 	 aren't flagged for use outside the body of a function.  */
       ++processing_contract_condition;
@@ -31519,6 +31525,8 @@ cp_parser_contract_attribute_spec (cp_parser *parser, tree attribute,
       cp_expr condition = cp_parser_conditional_expression (parser);
       if (postcondition_p)
 	--processing_contract_postcondition;
+      /* Revert (any) constification of the current class object.  */
+      current_class_ref = current_class_ref_copy;
       flag_contracts_nonattr_noconst = old_flag_contracts_nonattr_noconst;
       --processing_contract_condition;