c++, contracts: Make sure late-parsed condition locations are handled.

When late-parsing, we should collect the location information from the
parser output and pass that down to finish_contract_condition via
update_late-contract.

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

Author: iains

gcc/cp/contracts.cc

@@ -847,7 +847,7 @@ finish_contract_attribute (tree identifier, tree contract)
    if any.  */
 
 void
-update_late_contract (tree contract, tree result, tree condition)
+update_late_contract (tree contract, tree result, cp_expr condition)
 {
   if (TREE_CODE (contract) == POSTCONDITION_STMT)
     POSTCONDITION_IDENTIFIER (contract) = result;

gcc/cp/contracts.h

@@ -334,7 +334,6 @@ extern void defer_guarded_contract_match	(tree, tree, tree);
 extern bool diagnose_misapplied_contracts	(tree);
 extern tree finish_contract_attribute		(tree, tree);
 extern tree invalidate_contract			(tree);
-extern void update_late_contract		(tree, tree, tree);
 extern tree splice_out_contracts		(tree);
 extern bool all_attributes_are_contracts_p	(tree);
 extern void copy_and_remap_contracts		(tree, tree, bool, bool);

gcc/cp/cp-tree.h

@@ -8932,6 +8932,7 @@ extern tree make_postcondition_variable		(cp_expr);
 extern tree make_postcondition_variable		(cp_expr, tree);
 extern tree grok_contract			(tree, tree, tree, cp_expr, location_t);
 extern tree finish_contract_condition		(cp_expr);
+extern void update_late_contract		(tree, tree, cp_expr);
 extern tree constify_contract_access            (tree);
 extern bool maybe_reject_param_in_postcondition (tree);
 

gcc/cp/parser.cc

@@ -31645,9 +31645,9 @@ void cp_parser_late_contract_condition (cp_parser *parser,
       result = make_postcondition_variable (identifier, type);
       ++processing_template_decl;
     }
-  condition = cp_parser_conditional_expression (parser);
+  cp_expr parsed_condition = cp_parser_conditional_expression (parser);
   /* Commit to changes.  */
-  update_late_contract (contract, result, condition);
+  update_late_contract (contract, result, parsed_condition);
   /* Leave our temporary scope for the postcondition result.  */
   if (identifier)
     --processing_template_decl;