about summary refs log tree commit diff
path: root/src/librustc_codegen_ssa/mir
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-07-26 09:09:43 +0000
committerbors <bors@rust-lang.org>2020-07-26 09:09:43 +0000
commit13f9aa190957b993a268fd4a046fce76ca8814ee (patch)
treee3afb4f7850e5aba24cdfe044303d17a97c04daf /src/librustc_codegen_ssa/mir
parent461707c5a119cc33c5d7df585ddb6cbec4a081bf (diff)
parentef9c4f5cef53c547b6f0af7c3049abb319368419 (diff)
downloadrust-13f9aa190957b993a268fd4a046fce76ca8814ee.tar.gz
rust-13f9aa190957b993a268fd4a046fce76ca8814ee.zip
Auto merge of #74664 - pnadon:Miri-rename-undef-uninit, r=RalfJung
Miri rename undef uninit

Renamed parts of code within the `librustc_middle/mir/interpret/` directory.

Related issue [#71193](https://github.com/rust-lang/rust/issues/71193)
Diffstat (limited to 'src/librustc_codegen_ssa/mir')
-rw-r--r--src/librustc_codegen_ssa/mir/block.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_codegen_ssa/mir/block.rs b/src/librustc_codegen_ssa/mir/block.rs
index f9e1094ff73..e8270b4fa0a 100644
--- a/src/librustc_codegen_ssa/mir/block.rs
+++ b/src/librustc_codegen_ssa/mir/block.rs
@@ -883,7 +883,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
                                 let ptr = Pointer::new(AllocId(0), offset);
                                 alloc
                                     .read_scalar(&bx, ptr, size)
-                                    .and_then(|s| s.not_undef())
+                                    .and_then(|s| s.check_init())
                                     .unwrap_or_else(|e| {
                                         bx.tcx().sess.span_err(
                                             span,