Skip to content

Commit

Permalink
Auto merge of rust-lang#101483 - oli-obk:guaranteed_opt, r=fee1-dead
Browse files Browse the repository at this point in the history
The `<*const T>::guaranteed_*` methods now return an option for the unknown case

cc rust-lang#53020 (comment)

I chose `0` for "not equal" and `1` for "equal" and left `2` for the unknown case so backends can just forward to raw pointer equality and it works ✨

r? `@fee1-dead` or `@lcnr`

cc `@rust-lang/wg-const-eval`
  • Loading branch information
bors committed Sep 10, 2022
2 parents 944a142 + 931c07c commit 16ed191
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions src/intrinsics/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -816,20 +816,13 @@ fn codegen_regular_intrinsic_call<'tcx>(
ret.write_cvalue(fx, val);
}

sym::ptr_guaranteed_eq => {
sym::ptr_guaranteed_cmp => {
intrinsic_args!(fx, args => (a, b); intrinsic);

let val = crate::num::codegen_ptr_binop(fx, BinOp::Eq, a, b);
ret.write_cvalue(fx, val);
}

sym::ptr_guaranteed_ne => {
intrinsic_args!(fx, args => (a, b); intrinsic);

let val = crate::num::codegen_ptr_binop(fx, BinOp::Ne, a, b);
ret.write_cvalue(fx, val);
}

sym::caller_location => {
intrinsic_args!(fx, args => (); intrinsic);

Expand Down

0 comments on commit 16ed191

Please sign in to comment.