diff options
| author | bors <bors@rust-lang.org> | 2018-11-02 12:45:03 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-11-02 12:45:03 +0000 |
| commit | 87a3c1ee7016bbfb782f2fd8adc75b46687ef929 (patch) | |
| tree | d1f5ce96602af0244456e01139806980d7730c8b /src/librustc/ty | |
| parent | d0c869c323289c5ec4df83e1c9091fa0b3e2fc07 (diff) | |
| parent | d10304eeb5c9e63597b9ee1094aca0f63c4f31ca (diff) | |
| download | rust-87a3c1ee7016bbfb782f2fd8adc75b46687ef929.tar.gz rust-87a3c1ee7016bbfb782f2fd8adc75b46687ef929.zip | |
Auto merge of #55316 - RalfJung:retagging, r=oli-obk
Add Retagging statements This adds a `Retag` statement kind to MIR, used to perform the retagging operation from [Stacked Borrows](https://www.ralfj.de/blog/2018/08/07/stacked-borrows.html). It also kills the old `Validate` statements that I added last year. NOTE: This includes https://github.com/rust-lang/rust/pull/55270. Only [these commits are new](https://github.com/RalfJung/rust/compare/stacked-borrows-ng...RalfJung:retagging).
Diffstat (limited to 'src/librustc/ty')
| -rw-r--r-- | src/librustc/ty/context.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/librustc/ty/context.rs b/src/librustc/ty/context.rs index d4b47db6081..409665e4777 100644 --- a/src/librustc/ty/context.rs +++ b/src/librustc/ty/context.rs @@ -1547,11 +1547,9 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> { } /// Should we emit EndRegion MIR statements? These are consumed by - /// MIR borrowck, but not when NLL is used. They are also consumed - /// by the validation stuff. + /// MIR borrowck, but not when NLL is used. pub fn emit_end_regions(self) -> bool { self.sess.opts.debugging_opts.emit_end_regions || - self.sess.opts.debugging_opts.mir_emit_validate > 0 || self.use_mir_borrowck() } |