Repository navigation
std: Unstably constify std::process::abort - #166194
Conversation
|
@RalfJung any concerns? I don't love using |
std::process::abortstd::process::abort
|
Also cc @rust-lang/libs-ping for this possible API change |
Cc @rust-lang/wg-const-eval |
|
r? me r=me assuming that wg-const-eval is happy with the usage here. |
| pub fn abort() -> ! { | ||
| crate::sys::abort_internal(); | ||
| pub const fn abort() -> ! { | ||
| intrinsics::const_eval_select((), crash, crate::sys::abort_internal) |
There was a problem hiding this comment.
| intrinsics::const_eval_select((), crash, crate::sys::abort_internal) | |
| // Some code uses `abort` as a non-unwinding alternative to `panic`. | |
| // That should work in const, but `sys` code invokes native host functions. | |
| // So we invoke `intrinsics::crash` instead to safely hard-abort execution. | |
| intrinsics::const_eval_select((), crash, crate::sys::abort_internal) |
There was a problem hiding this comment.
You forgot the first line of my suggestion.^^
There was a problem hiding this comment.
Whoops, I blame it on the interesting highlighting of that diff. Updated again
FWIW our panic machinery fully supports non-unwinding panics where you still get a nice backtrace before aborting. Sounds like it may be worth exposing that publicly? |
I expect that's coming in the near future, there have been informal proposals for |
063873c to
4e0b968
Compare
`abort` is getting used a bit more in places where unwinding via `panic!` isn't desired. Some of these places involve shared const and runtime code, so mark `abort` unstably `const` to make this a bit easier. This uses `core::process::crash` as the const implementation, which will be const stable in the near future.
4e0b968 to
54e07ae
Compare
|
@bors r=clarfonthey,RalfJung rollup |
…y,RalfJung std: Unstably constify `std::process::abort` `abort` is getting used a bit more in places where unwinding via `panic!` isn't desired. Some of these places involve shared const and runtime code, so mark `abort` unstably `const` to make this a bit easier. This uses `core::process::crash` as the const implementation, which will be const stable in the near future. Tracking issue: rust-lang#166193.
…uwer Rollup of 13 pull requests Successful merges: - #157721 (compiletest: Add testing for lint machinery at runtime) - #165934 (Avoid using Terminator:None in simplify_cfg) - #166117 (Remove ebadf handling from stdio) - #165094 (reflection: doc attributes from adts, fields, and variants) - #165216 (Clearer diagnostics when `&FnOnce` was provided when `FnOnce` was expected) - #165694 (view-types: make sure view types are !Sized) - #165883 (Report a recursion limit error instead of delaying a bug in RPITIT collector) - #165971 (fix: non-deterministic temporary object paths in linker maps) - #166136 (Move ub_checks() inside the const_eval_select branch.) - #166166 (Don't recover if not allowed in `parse_seq_to_before_tokens`) - #166176 (compiletest: Move all code out of the crate root) - #166185 (simd-test: Fix cfg syntax in the test macro) - #166194 (std: Unstably constify `std::process::abort`) Failed merges: - #166150 (Reflection: refactor Type and TypeKind) - #166160 (refactor CTFE-specific intrinsics to different file)
…y,RalfJung std: Unstably constify `std::process::abort` `abort` is getting used a bit more in places where unwinding via `panic!` isn't desired. Some of these places involve shared const and runtime code, so mark `abort` unstably `const` to make this a bit easier. This uses `core::process::crash` as the const implementation, which will be const stable in the near future. Tracking issue: rust-lang#166193.
…uwer Rollup of 16 pull requests Successful merges: - #166078 (rustc_type_ir: Optimize `sub_root_lookup_table` by using `SsoHashMap`, not `HashMap`) - #165934 (Avoid using Terminator:None in simplify_cfg) - #166050 (Use attribute parser for lang attributes in `LateResolutionVisitor`) - #166117 (Remove ebadf handling from stdio) - #166119 (Avoid an ICE on re-exports of private imports without a DefId) - #165094 (reflection: doc attributes from adts, fields, and variants) - #165216 (Clearer diagnostics when `&FnOnce` was provided when `FnOnce` was expected) - #165694 (view-types: make sure view types are !Sized) - #165883 (Report a recursion limit error instead of delaying a bug in RPITIT collector) - #165971 (fix: non-deterministic temporary object paths in linker maps) - #166064 (Add const generic transmute min support) - #166136 (Move ub_checks() inside the const_eval_select branch.) - #166166 (Don't recover if not allowed in `parse_seq_to_before_tokens`) - #166176 (compiletest: Move all code out of the crate root) - #166185 (simd-test: Fix cfg syntax in the test macro) - #166194 (std: Unstably constify `std::process::abort`) Failed merges: - #166150 (Reflection: refactor Type and TypeKind) - #166160 (refactor CTFE-specific intrinsics to different file)
…y,RalfJung std: Unstably constify `std::process::abort` `abort` is getting used a bit more in places where unwinding via `panic!` isn't desired. Some of these places involve shared const and runtime code, so mark `abort` unstably `const` to make this a bit easier. This uses `core::process::crash` as the const implementation, which will be const stable in the near future. Tracking issue: rust-lang#166193.
Rollup of 21 pull requests Successful merges: - #165707 (bootstrap: Make low priority the default) - #165716 (Refactor split_block in check_pointers to avoid Terminator: None) - #165934 (Avoid using Terminator:None in simplify_cfg) - #166050 (Use attribute parser for lang attributes in `LateResolutionVisitor`) - #166069 (bootstrap: fix keep-stage-std) - #166117 (Remove ebadf handling from stdio) - #166119 (Avoid an ICE on re-exports of private imports without a DefId) - #165094 (reflection: doc attributes from adts, fields, and variants) - #165216 (Clearer diagnostics when `&FnOnce` was provided when `FnOnce` was expected) - #165694 (view-types: make sure view types are !Sized) - #165802 (Add CI workflow to publish backtrace after a push to main) - #165883 (Report a recursion limit error instead of delaying a bug in RPITIT collector) - #165906 (fix ICE when a forced keyword follows a parameter pattern) - #166064 (Add const generic transmute min support) - #166136 (Move ub_checks() inside the const_eval_select branch.) - #166158 (bump some tools' `toml` dependency) - #166166 (Don't recover if not allowed in `parse_seq_to_before_tokens`) - #166176 (compiletest: Move all code out of the crate root) - #166185 (simd-test: Fix cfg syntax in the test macro) - #166194 (std: Unstably constify `std::process::abort`) - #166210 (Avoid terminator: None in insert_direct_enum_check) Failed merges: - #166150 (Reflection: refactor Type and TypeKind) - #166160 (refactor CTFE-specific intrinsics to different file)
Rollup of 20 pull requests Successful merges: - #165716 (Refactor split_block in check_pointers to avoid Terminator: None) - #165934 (Avoid using Terminator:None in simplify_cfg) - #166050 (Use attribute parser for lang attributes in `LateResolutionVisitor`) - #166069 (bootstrap: fix keep-stage-std) - #166117 (Remove ebadf handling from stdio) - #166119 (Avoid an ICE on re-exports of private imports without a DefId) - #165094 (reflection: doc attributes from adts, fields, and variants) - #165216 (Clearer diagnostics when `&FnOnce` was provided when `FnOnce` was expected) - #165694 (view-types: make sure view types are !Sized) - #165802 (Add CI workflow to publish backtrace after a push to main) - #165883 (Report a recursion limit error instead of delaying a bug in RPITIT collector) - #165906 (fix ICE when a forced keyword follows a parameter pattern) - #166064 (Add const generic transmute min support) - #166136 (Move ub_checks() inside the const_eval_select branch.) - #166158 (bump some tools' `toml` dependency) - #166166 (Don't recover if not allowed in `parse_seq_to_before_tokens`) - #166176 (compiletest: Move all code out of the crate root) - #166185 (simd-test: Fix cfg syntax in the test macro) - #166194 (std: Unstably constify `std::process::abort`) - #166210 (Avoid terminator: None in insert_direct_enum_check) Failed merges: - #166150 (Reflection: refactor Type and TypeKind) - #166160 (refactor CTFE-specific intrinsics to different file)
Rollup merge of #166194 - tgross35:const-abort, r=clarfonthey,RalfJung std: Unstably constify `std::process::abort` `abort` is getting used a bit more in places where unwinding via `panic!` isn't desired. Some of these places involve shared const and runtime code, so mark `abort` unstably `const` to make this a bit easier. This uses `core::process::crash` as the const implementation, which will be const stable in the near future. Tracking issue: #166193.
abortis getting used a bit more in places where unwinding viapanic!isn't desired. Some of these places involve shared const and runtime code, so markabortunstablyconstto make this a bit easier.This uses
core::process::crashas the const implementation, which will be const stable in the near future.Tracking issue: #166193.
r? libs