about summary refs log tree commit diff
path: root/src/librustc_codegen_llvm
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-11-15 01:12:01 +0000
committerbors <bors@rust-lang.org>2018-11-15 01:12:01 +0000
commit4ec0ba9545f7c848aafc0bc1b8762507395edd41 (patch)
treef4ba507ff41add222bcb5d2d34c25cef07817630 /src/librustc_codegen_llvm
parent7d3b9b1640611c52eb949dd60e8b9565997c6cea (diff)
parentb891a81164e86fa21f55607bc56b0b8e04083936 (diff)
downloadrust-4ec0ba9545f7c848aafc0bc1b8762507395edd41.tar.gz
rust-4ec0ba9545f7c848aafc0bc1b8762507395edd41.zip
Auto merge of #55716 - RalfJung:escape-to-raw, r=oli-obk
Add escape-to-raw MIR statement

Add a new MIR "ghost state statement": Escaping a ptr to permit raw accesses.

~~This includes #55549, [click here](https://github.com/RalfJung/rust/compare/miri-visitor...RalfJung:escape-to-raw) for just the new commits.~~
Diffstat (limited to 'src/librustc_codegen_llvm')
-rw-r--r--src/librustc_codegen_llvm/mir/statement.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/librustc_codegen_llvm/mir/statement.rs b/src/librustc_codegen_llvm/mir/statement.rs
index c8c8e02bf05..8bda2c98594 100644
--- a/src/librustc_codegen_llvm/mir/statement.rs
+++ b/src/librustc_codegen_llvm/mir/statement.rs
@@ -105,8 +105,9 @@ impl FunctionCx<'a, 'll, 'tcx> {
                 bx
             }
             mir::StatementKind::FakeRead(..) |
-            mir::StatementKind::EndRegion(_) |
+            mir::StatementKind::EndRegion(..) |
             mir::StatementKind::Retag { .. } |
+            mir::StatementKind::EscapeToRaw { .. } |
             mir::StatementKind::AscribeUserType(..) |
             mir::StatementKind::Nop => bx,
         }