mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix rebase

Browse Source
This commit is contained in:
Jannis Christopher Köhl 2022-11-07 11:01:44 +01:00
parent 89f934917d
commit 3997893ccb
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
compiler/rustc_mir_dataflow/src/value_analysis.rs
View File

@ -53,7 +53,6 @@ use rustc_middle::mir::tcx::PlaceTy;
use rustc_middle::mir::visit::{PlaceContext, Visitor}; use rustc_middle::mir::visit::{PlaceContext, Visitor};
use rustc_middle::mir::*; use rustc_middle::mir::*;
use rustc_middle::ty::{self, Ty, TyCtxt}; use rustc_middle::ty::{self, Ty, TyCtxt};
use rustc_span::DUMMY_SP;
use rustc_target::abi::VariantIdx; use rustc_target::abi::VariantIdx;
use crate::lattice::{HasBottom, HasTop}; use crate::lattice::{HasBottom, HasTop};
@ -694,7 +693,7 @@ impl Map {
if max_derefs > 0 { if max_derefs > 0 {
if let Some(ty::TypeAndMut { ty: deref_ty, .. }) = ty.builtin_deref(false) { if let Some(ty::TypeAndMut { ty: deref_ty, .. }) = ty.builtin_deref(false) {
// Values behind references can only be tracked if the target is `Freeze`. // Values behind references can only be tracked if the target is `Freeze`.
if deref_ty.is_freeze(tcx.at(DUMMY_SP), param_env) { if deref_ty.is_freeze(tcx, param_env) {
projection.push(PlaceElem::Deref); projection.push(PlaceElem::Deref);
self.register_with_filter_rec( self.register_with_filter_rec(
tcx, tcx,

3
src/test/mir-opt/issue_101973.inner.ConstProp.diff
View File

@ -37,7 +37,6 @@
StorageLive(_4); // scope 0 at $DIR/issue_101973.rs:+1:5: +1:17 StorageLive(_4); // scope 0 at $DIR/issue_101973.rs:+1:5: +1:17
StorageLive(_5); // scope 0 at $DIR/issue_101973.rs:+1:10: +1:16 StorageLive(_5); // scope 0 at $DIR/issue_101973.rs:+1:10: +1:16
_5 = _1; // scope 0 at $DIR/issue_101973.rs:+1:10: +1:16 _5 = _1; // scope 0 at $DIR/issue_101973.rs:+1:10: +1:16
_4 = const 0_u32; // scope 1 at $DIR/issue_101973.rs:6:19: 6:23
StorageLive(_12); // scope 2 at $DIR/issue_101973.rs:7:12: 7:27 StorageLive(_12); // scope 2 at $DIR/issue_101973.rs:7:12: 7:27
StorageLive(_13); // scope 2 at $DIR/issue_101973.rs:7:12: 7:20 StorageLive(_13); // scope 2 at $DIR/issue_101973.rs:7:12: 7:20
StorageLive(_14); // scope 2 at $DIR/issue_101973.rs:7:13: 7:14 StorageLive(_14); // scope 2 at $DIR/issue_101973.rs:7:13: 7:14
@ -73,7 +72,7 @@
StorageDead(_14); // scope 2 at $DIR/issue_101973.rs:7:19: 7:20 StorageDead(_14); // scope 2 at $DIR/issue_101973.rs:7:19: 7:20
_12 = BitAnd(move _13, const 255_u32); // scope 2 at $DIR/issue_101973.rs:7:12: 7:27 _12 = BitAnd(move _13, const 255_u32); // scope 2 at $DIR/issue_101973.rs:7:12: 7:27
StorageDead(_13); // scope 2 at $DIR/issue_101973.rs:7:26: 7:27 StorageDead(_13); // scope 2 at $DIR/issue_101973.rs:7:26: 7:27
_4 = BitOr(_4, move _12); // scope 2 at $DIR/issue_101973.rs:7:5: 7:27 _4 = BitOr(const 0_u32, move _12); // scope 2 at $DIR/issue_101973.rs:7:5: 7:27
StorageDead(_12); // scope 2 at $DIR/issue_101973.rs:7:26: 7:27 StorageDead(_12); // scope 2 at $DIR/issue_101973.rs:7:26: 7:27
StorageDead(_5); // scope 0 at $DIR/issue_101973.rs:+1:16: +1:17 StorageDead(_5); // scope 0 at $DIR/issue_101973.rs:+1:16: +1:17
StorageLive(_6); // scope 0 at $DIR/issue_101973.rs:+1:31: +1:57 StorageLive(_6); // scope 0 at $DIR/issue_101973.rs:+1:31: +1:57