From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2122) id 3398F3858425; Fri, 21 Oct 2022 01:23:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3398F3858425 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1666315437; bh=mFRJtjA7qcBHRbKxHptFfqGRwXTZQ786+k+/cLaX084=; h=From:To:Subject:Date:From; b=ssjohisc71mYrCya9LZut+ItE0psX4Ly3nXu9aBU+Fxu7WKcvJKk3N3ygMI666zTD jQk2NmQmAQxYK5BinXE+fdZU79Zszvsc8jVLhz+oc8ggWp1vm9Gnvt2sC7eXweRo8Y +zEdZotlw9sjknoSKc64KiKeOQYTlfVllRQrE/dU= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Jason Merrill To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/c++-contracts] c++: move contracts init to contracts.cc X-Act-Checkin: gcc X-Git-Author: Jason Merrill X-Git-Refname: refs/heads/devel/c++-contracts X-Git-Oldrev: b141fc304e150b643a7e697881490cbc643cbf0e X-Git-Newrev: de497a4f4b03e13c7a1084491de7afcc923f90f1 Message-Id: <20221021012357.3398F3858425@sourceware.org> Date: Fri, 21 Oct 2022 01:23:57 +0000 (GMT) List-Id: https://gcc.gnu.org/g:de497a4f4b03e13c7a1084491de7afcc923f90f1 commit de497a4f4b03e13c7a1084491de7afcc923f90f1 Author: Jason Merrill Date: Tue Oct 18 16:56:06 2022 -0400 c++: move contracts init to contracts.cc gcc/cp/ChangeLog: * cp-tree.h (init_contract_processing): Declare. * decl.cc (cxx_init_decl_processing): Call it. * contracts.cc (init_contract_processing): Move from... * except.cc (init_exception_processing): ...here. Diff: --- gcc/cp/cp-tree.h | 1 + gcc/cp/contracts.cc | 23 +++++++++++++++++++++++ gcc/cp/decl.cc | 3 +++ gcc/cp/except.cc | 16 ---------------- 4 files changed, 27 insertions(+), 16 deletions(-) diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 29d49466525..f011231acb3 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -7751,6 +7751,7 @@ enum contract_matching_context cmc_override }; +extern void init_contract_processing (); extern tree invalidate_contract (tree); extern tree make_postcondition_variable (cp_expr); extern tree make_postcondition_variable (cp_expr, tree); diff --git a/gcc/cp/contracts.cc b/gcc/cp/contracts.cc index b1cf2875ce4..0bc8305570d 100644 --- a/gcc/cp/contracts.cc +++ b/gcc/cp/contracts.cc @@ -1967,4 +1967,27 @@ apply_postcondition_to_return (tree expr) return call; } +/* Set up built-ins for contracts. */ + +void +init_contract_processing (void) +{ + /* std::contract_violation */ + tree tmp = build_function_type_list (integer_type_node, + boolean_type_node, + integer_type_node, + const_string_type_node, + const_string_type_node, + const_string_type_node, + const_string_type_node, + const_string_type_node, + integer_type_node, + NULL_TREE); + on_contract_violation_fn = + build_cp_library_fn_ptr ("__on_contract_violation", tmp, ECF_COLD); + on_contract_violation_never_fn = + build_cp_library_fn_ptr ("__on_contract_violation", tmp, + ECF_COLD | ECF_NORETURN); +} + #include "gt-cp-contracts.h" diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc index 1384358d079..edd57ee5d23 100644 --- a/gcc/cp/decl.cc +++ b/gcc/cp/decl.cc @@ -5025,6 +5025,9 @@ cxx_init_decl_processing (void) if (flag_exceptions) init_exception_processing (); + if (flag_contracts) + init_contract_processing (); + if (modules_p ()) init_modules (parse_in); diff --git a/gcc/cp/except.cc b/gcc/cp/except.cc index c5636b5d53a..2677a9b7678 100644 --- a/gcc/cp/except.cc +++ b/gcc/cp/except.cc @@ -60,22 +60,6 @@ init_exception_processing (void) && TREE_NOTHROW (terminate_fn)); pop_nested_namespace (std_node); - tmp = build_function_type_list (integer_type_node, - boolean_type_node, - integer_type_node, - const_string_type_node, - const_string_type_node, - const_string_type_node, - const_string_type_node, - const_string_type_node, - integer_type_node, - NULL_TREE); - on_contract_violation_fn = - build_cp_library_fn_ptr ("__on_contract_violation", tmp, ECF_COLD); - on_contract_violation_never_fn = - build_cp_library_fn_ptr ("__on_contract_violation", tmp, - ECF_COLD | ECF_NORETURN); - /* void __cxa_call_unexpected(void *); */ tmp = build_function_type_list (void_type_node, ptr_type_node, NULL_TREE); call_unexpected_fn