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_mir_transform/src/instsimplify.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_mir_transform/src/instsimplify.rs')
| -rw-r--r-- | compiler/rustc_mir_transform/src/instsimplify.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_mir_transform/src/instsimplify.rs b/compiler/rustc_mir_transform/src/instsimplify.rs index 1589653968c..3ec553d0ba0 100644 --- a/compiler/rustc_mir_transform/src/instsimplify.rs +++ b/compiler/rustc_mir_transform/src/instsimplify.rs @@ -141,7 +141,7 @@ impl<'tcx> InstSimplifyContext<'tcx, '_> { /// Transform `&(*a)` ==> `a`. fn simplify_ref_deref(&self, source_info: &SourceInfo, rvalue: &mut Rvalue<'tcx>) { - if let Rvalue::Ref(_, _, place) | Rvalue::AddressOf(_, place) = rvalue { + if let Rvalue::Ref(_, _, place) | Rvalue::RawPtr(_, place) = rvalue { if let Some((base, ProjectionElem::Deref)) = place.as_ref().last_projection() { if rvalue.ty(self.local_decls, self.tcx) != base.ty(self.local_decls, self.tcx).ty { return; |