diff options
| author | Jonas Schievink <jonasschievink@gmail.com> | 2021-01-23 20:15:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-23 20:15:59 +0100 |
| commit | 3382771dfd84c56c29d0cabc38b6e2db9554c02c (patch) | |
| tree | 1160f226900339145cdb29903a1c4a032fb85662 /compiler/rustc_codegen_ssa/src | |
| parent | 7635462fe8f5ad46cbf24344805f75f8209747dd (diff) | |
| parent | 1b09dc2596c88dcf3fb840046f05db5e8595e9ca (diff) | |
| download | rust-3382771dfd84c56c29d0cabc38b6e2db9554c02c.tar.gz rust-3382771dfd84c56c29d0cabc38b6e2db9554c02c.zip | |
Rollup merge of #81072 - RalfJung:place-ref-ty, r=oli-obk
PlaceRef::ty: use method call syntax
Diffstat (limited to 'compiler/rustc_codegen_ssa/src')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/mir/analyze.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/mir/place.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_ssa/src/mir/analyze.rs b/compiler/rustc_codegen_ssa/src/mir/analyze.rs index b1e372afc65..fd0ff5b66e6 100644 --- a/compiler/rustc_codegen_ssa/src/mir/analyze.rs +++ b/compiler/rustc_codegen_ssa/src/mir/analyze.rs @@ -119,7 +119,7 @@ impl<Bx: BuilderMethods<'a, 'tcx>> LocalAnalyzer<'mir, 'a, 'tcx, Bx> { ) ); if is_consume { - let base_ty = mir::PlaceRef::ty(&place_base, self.fx.mir, cx.tcx()); + let base_ty = place_base.ty(self.fx.mir, cx.tcx()); let base_ty = self.fx.monomorphize(base_ty); // ZSTs don't require any actual memory access. diff --git a/compiler/rustc_codegen_ssa/src/mir/place.rs b/compiler/rustc_codegen_ssa/src/mir/place.rs index 958e4ebd078..66d9d1a1e0c 100644 --- a/compiler/rustc_codegen_ssa/src/mir/place.rs +++ b/compiler/rustc_codegen_ssa/src/mir/place.rs @@ -506,7 +506,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> { pub fn monomorphized_place_ty(&self, place_ref: mir::PlaceRef<'tcx>) -> Ty<'tcx> { let tcx = self.cx.tcx(); - let place_ty = mir::PlaceRef::ty(&place_ref, self.mir, tcx); + let place_ty = place_ref.ty(self.mir, tcx); self.monomorphize(place_ty.ty) } } |
