Remove no longer used contract_checks intrinsic

The contract_checks compiler flag is now used to determine
if runtime contract checks should be enabled, as opposed
to the compiler intrinsic as previously.

Remove remaining contract_check cfg flags

Author: dawidl022

compiler/rustc_codegen_ssa/src/mir/intrinsic.rs

@@ -115,7 +115,6 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
                 | sym::assert_mem_uninitialized_valid
                 | sym::assert_inhabited
                 | sym::ub_checks
-                | sym::contract_checks
                 | sym::atomic_fence
                 | sym::atomic_singlethreadfence
                 | sym::caller_location => {}

compiler/rustc_feature/src/builtin_attrs.rs

@@ -22,7 +22,6 @@ const GATED_CFGS: &[GatedCfg] = &[
     // (name in cfg, feature, function to check if the feature is enabled)
     (sym::overflow_checks, sym::cfg_overflow_checks, Features::cfg_overflow_checks),
     (sym::ub_checks, sym::cfg_ub_checks, Features::cfg_ub_checks),
-    (sym::contract_checks, sym::cfg_contract_checks, Features::cfg_contract_checks),
     (sym::target_thread_local, sym::cfg_target_thread_local, Features::cfg_target_thread_local),
     (
         sym::target_has_atomic_equal_alignment,

compiler/rustc_feature/src/unstable.rs

@@ -400,8 +400,6 @@ declare_features! (
     (unstable, avx10_target_feature, "1.88.0", Some(138843)),
     /// Allows using C-variadics.
     (unstable, c_variadic, "1.34.0", Some(44930)),
-    /// Allows the use of `#[cfg(contract_checks)` to check if contract checks are enabled.
-    (unstable, cfg_contract_checks, "1.86.0", Some(128044)),
     /// Allows the use of `#[cfg(overflow_checks)` to check if integer overflow behaviour.
     (unstable, cfg_overflow_checks, "1.71.0", Some(111466)),
     /// Provides the relocation model information as cfg entry

compiler/rustc_hir/src/lang_items.rs

@@ -429,7 +429,6 @@ language_item_table! {
     // Experimental lang items for implementing contract pre- and post-condition checking.
     ContractBuildCheckEnsures, sym::contract_build_check_ensures, contract_build_check_ensures_fn, Target::Fn, GenericRequirement::None;
     ContractCheckRequires,     sym::contract_check_requires,      contract_check_requires_fn,      Target::Fn, GenericRequirement::None;
-    ContractChecks,            sym::contract_checks,              contract_checks_fn,              Target::Fn, GenericRequirement::None;
 
     // Experimental lang items for `MCP: Low level components for async drop`(https://github.com/rust-lang/compiler-team/issues/727)
     DefaultTrait4,           sym::default_trait4,      default_trait4_trait,       Target::Trait,          GenericRequirement::None;

compiler/rustc_hir_analysis/src/check/intrinsic.rs

@@ -89,7 +89,6 @@ fn intrinsic_operation_unsafety(tcx: TyCtxt<'_>, intrinsic_id: LocalDefId) -> hi
         | sym::const_eval_select
         | sym::contract_check_ensures
         | sym::contract_check_requires
-        | sym::contract_checks
         | sym::cosf16
         | sym::cosf32
         | sym::cosf64
@@ -639,8 +638,6 @@ pub(crate) fn check_intrinsic_type(
 
         sym::box_new => (1, 0, vec![param(0)], Ty::new_box(tcx, param(0))),
 
-        // contract_checks() -> bool
-        sym::contract_checks => (0, 0, Vec::new(), tcx.types.bool),
         // contract_check_requires::<C>(C) -> bool, where C: impl Fn() -> bool
         sym::contract_check_requires => (1, 0, vec![param(0)], tcx.types.unit),
         sym::contract_check_ensures => {

compiler/rustc_mir_transform/src/lower_intrinsics.rs

@@ -34,17 +34,6 @@ impl<'tcx> crate::MirPass<'tcx> for LowerIntrinsics {
                         ));
                         terminator.kind = TerminatorKind::Goto { target };
                     }
-                    sym::contract_checks => {
-                        let target = target.unwrap();
-                        block.statements.push(Statement::new(
-                            terminator.source_info,
-                            StatementKind::Assign(Box::new((
-                                *destination,
-                                Rvalue::NullaryOp(NullOp::ContractChecks, tcx.types.bool),
-                            ))),
-                        ));
-                        terminator.kind = TerminatorKind::Goto { target };
-                    }
                     sym::forget => {
                         let target = target.unwrap();
                         block.statements.push(Statement::new(

compiler/rustc_session/src/config/cfg.rs

@@ -118,7 +118,6 @@ pub(crate) fn disallow_cfgs(sess: &Session, user_cfgs: &Cfg) {
             (sym::overflow_checks, None) => disallow(cfg, "-C overflow-checks"),
             (sym::debug_assertions, None) => disallow(cfg, "-C debug-assertions"),
             (sym::ub_checks, None) => disallow(cfg, "-Z ub-checks"),
-            (sym::contract_checks, None) => disallow(cfg, "-Z contract-checks"),
             (sym::sanitize, None | Some(_)) => disallow(cfg, "-Z sanitizer"),
             (
                 sym::sanitizer_cfi_generalize_pointers | sym::sanitizer_cfi_normalize_integers,
@@ -314,10 +313,6 @@ pub(crate) fn default_configuration(sess: &Session) -> Cfg {
         ins_none!(sym::emscripten_wasm_eh);
     }
 
-    if sess.contract_checks() {
-        ins_none!(sym::contract_checks);
-    }
-
     ret
 }
 
@@ -480,7 +475,6 @@ impl CheckCfg {
         ins!(sym::target_thread_local, no_values);
 
         ins!(sym::ub_checks, no_values);
-        ins!(sym::contract_checks, no_values);
 
         ins!(sym::unix, no_values);
         ins!(sym::windows, no_values);

compiler/rustc_span/src/symbol.rs

@@ -623,7 +623,6 @@ symbols! {
         cfg_attr_multi,
         cfg_attr_trace: "<cfg_attr>", // must not be a valid identifier
         cfg_boolean_literals,
-        cfg_contract_checks,
         cfg_doctest,
         cfg_emscripten_wasm_eh,
         cfg_eval,
@@ -747,7 +746,6 @@ symbols! {
         contract_build_check_ensures,
         contract_check_ensures,
         contract_check_requires,
-        contract_checks,
         contracts,
         contracts_ensures,
         contracts_internals,

library/core/src/intrinsics/mod.rs

@@ -2631,24 +2631,6 @@ pub const unsafe fn const_make_global(ptr: *mut u8) -> *const u8 {
     ptr
 }
 
-/// Returns whether we should perform contract-checking at runtime.
-///
-/// This is meant to be similar to the ub_checks intrinsic, in terms
-/// of not prematurely committing at compile-time to whether contract
-/// checking is turned on, so that we can specify contracts in libstd
-/// and let an end user opt into turning them on.
-#[unstable(feature = "contracts_internals", issue = "128044" /* compiler-team#759 */)]
-#[rustc_const_unstable(feature = "contracts", issue = "128044")]
-#[inline(always)]
-#[lang = "contract_checks"]
-#[rustc_intrinsic]
-pub const fn contract_checks() -> bool {
-    // FIXME: should this be `false` or `cfg!(contract_checks)`?
-
-    // cfg!(contract_checks)
-    false
-}
-
 /// Check if the pre-condition `cond` has been met.
 ///
 /// By default, if `contract_checks` is enabled, this will panic with no unwind if the condition

src/doc/rustc-dev-guide/src/building/bootstrapping/bootstrap-in-dependencies.md

@@ -13,7 +13,7 @@ warning: unexpected `cfg` condition name: `bootstrap`
 1 | #[cfg(bootstrap)]
   |       ^^^^^^^^^
   |
-  = help: expected names are: `docsrs`, `feature`, and `test` and 31 more
+  = help: expected names are: `docsrs`, `feature`, and `test` and 30 more
   = help: consider using a Cargo feature instead
   = help: or consider adding in `Cargo.toml` the `check-cfg` lint config for the lint:
            [lints.rust]