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

Resolve https://github.com/rust-lang/rust/pull/76673#discussion_r494426303

Browse Source
This commit is contained in:
Simon Vandel Sillesen 2020-09-24 21:02:53 +02:00
parent 87d262acb5
commit 7dec440340
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_middle/src/mir/terminator/mod.rs
View File

@ -96,6 +96,8 @@ pub enum TerminatorKind<'tcx> {
/// P <- V /// P <- V
/// } /// }
/// ``` /// ```
///
/// Note that DropAndReplace is eliminated as part of the `ElaborateDrops` pass.
DropAndReplace { DropAndReplace {
place: Place<'tcx>, place: Place<'tcx>,
value: Operand<'tcx>, value: Operand<'tcx>,

3
compiler/rustc_mir/src/transform/remove_unneeded_drops.rs
View File

@ -38,8 +38,7 @@ impl<'tcx> MirPass<'tcx> for RemoveUnneededDrops {
impl<'a, 'tcx> Visitor<'tcx> for RemoveUnneededDropsOptimizationFinder<'a, 'tcx> { impl<'a, 'tcx> Visitor<'tcx> for RemoveUnneededDropsOptimizationFinder<'a, 'tcx> {
fn visit_terminator(&mut self, terminator: &Terminator<'tcx>, location: Location) { fn visit_terminator(&mut self, terminator: &Terminator<'tcx>, location: Location) {
match terminator.kind { match terminator.kind {
TerminatorKind::Drop { place, target, .. } TerminatorKind::Drop { place, target, .. } => {
| TerminatorKind::DropAndReplace { place, target, .. } => {
let ty = place.ty(self.body, self.tcx); let ty = place.ty(self.body, self.tcx);
let needs_drop = ty.ty.needs_drop(self.tcx, self.tcx.param_env(self.def_id)); let needs_drop = ty.ty.needs_drop(self.tcx, self.tcx.param_env(self.def_id));
if !needs_drop { if !needs_drop {