diff options
| author | bors <bors@rust-lang.org> | 2024-08-19 06:23:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-08-19 06:23:49 +0000 |
| commit | e3f909b2bbd0b10db6f164d466db237c582d3045 (patch) | |
| tree | 35f38ab5390b874a6baf8282ad9d22f5f2c33cf7 /compiler/rustc_const_eval/src/check_consts/resolver.rs | |
| parent | 804be74e3c4ec3646b448dfdb7a0fc31237a5818 (diff) | |
| parent | 8a513f1720926799f4507c0bb8fb8d1b164ed459 (diff) | |
Auto merge of #129261 - tgross35:rollup-xjbvqx7, r=tgross35
Rollup of 7 pull requests Successful merges: - #127679 (Stabilize `raw_ref_op` (RFC 2582)) - #128084 (Suggest adding Result return type for associated method in E0277.) - #128628 (When deduplicating unreachable blocks, erase the source information.) - #128902 (doc: std::env::var: Returns None for names with '=' or NUL byte) - #129048 (Update `crosstool-ng` for loongarch64) - #129116 (Include a copy of `compiler-rt` source in the `download-ci-llvm` tarball) - #129208 (Fix order of normalization and recursion in const folding.) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_const_eval/src/check_consts/resolver.rs')
| -rw-r--r-- | compiler/rustc_const_eval/src/check_consts/resolver.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_const_eval/src/check_consts/resolver.rs b/compiler/rustc_const_eval/src/check_consts/resolver.rs index ea3a5264357..681184f7fbc 100644 --- a/compiler/rustc_const_eval/src/check_consts/resolver.rs +++ b/compiler/rustc_const_eval/src/check_consts/resolver.rs @@ -96,7 +96,7 @@ where } fn address_of_allows_mutation(&self) -> bool { - // Exact set of permissions granted by AddressOf is undecided. Conservatively assume that + // Exact set of permissions granted by RawPtr is undecided. Conservatively assume that // it might allow mutation until resolution of #56604. true } @@ -170,7 +170,7 @@ where self.super_rvalue(rvalue, location); match rvalue { - mir::Rvalue::AddressOf(_mt, borrowed_place) => { + mir::Rvalue::RawPtr(_mt, borrowed_place) => { if !borrowed_place.is_indirect() && self.address_of_allows_mutation() { let place_ty = borrowed_place.ty(self.ccx.body, self.ccx.tcx).ty; if Q::in_any_value_of_ty(self.ccx, place_ty) { |