Skip to content

Commit

Permalink
Unrolled build for rust-lang#127625
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#127625 - SkiFire13:revert-comment-deletion, r=workingjubilee

Revert accidental comment deletion

This reverts an accidental comment deletion made in rust-lang#113128

See also rust-lang#113128 (comment)
  • Loading branch information
rust-timer committed Jul 12, 2024
2 parents 4a31a6c + d902179 commit 38a6f16
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions compiler/rustc_borrowck/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -821,6 +821,8 @@ impl<'a, 'mir, 'tcx, R> rustc_mir_dataflow::ResultsVisitor<'mir, 'tcx, R>
| TerminatorKind::Return
| TerminatorKind::TailCall { .. }
| TerminatorKind::CoroutineDrop => {
// Returning from the function implicitly kills storage for all locals and statics.
// Often, the storage will already have been killed by an explicit
// StorageDead, but we don't always emit those (notably on unwind paths),
// so this "extra check" serves as a kind of backup.
let borrow_set = self.borrow_set.clone();
Expand Down

0 comments on commit 38a6f16

Please sign in to comment.