diff options
| -rw-r--r-- | patches/0022-core-Disable-not-compiling-tests.patch | 2 | ||||
| -rw-r--r-- | patches/0023-core-Ignore-failing-tests.patch | 13 | ||||
| -rw-r--r-- | rust-toolchain | 2 | ||||
| -rw-r--r-- | src/base.rs | 1 | ||||
| -rw-r--r-- | src/constant.rs | 4 |
5 files changed, 18 insertions, 4 deletions
diff --git a/patches/0022-core-Disable-not-compiling-tests.patch b/patches/0022-core-Disable-not-compiling-tests.patch index 213b7bb5f29..009b2fed0f9 100644 --- a/patches/0022-core-Disable-not-compiling-tests.patch +++ b/patches/0022-core-Disable-not-compiling-tests.patch @@ -98,7 +98,7 @@ index 1a6be3a..42dbd59 100644 +*/ #[test] - #[cfg_attr(miri, ignore)] // Miri does not compute a maximal `mid` for `align_offset` + fn align_offset_zst() { diff --git a/library/core/tests/slice.rs b/library/core/tests/slice.rs index 6609bc3..241b497 100644 --- a/library/core/tests/slice.rs diff --git a/patches/0023-core-Ignore-failing-tests.patch b/patches/0023-core-Ignore-failing-tests.patch index 8104b8d767a..ff8cece212c 100644 --- a/patches/0023-core-Ignore-failing-tests.patch +++ b/patches/0023-core-Ignore-failing-tests.patch @@ -30,6 +30,19 @@ index 4bc44e9..8e3c7a4 100644 #[test] fn empty_array_is_always_default() { +@@ -304,6 +304,7 @@ fn array_map() { + assert_eq!(b, [1, 2, 3]); + } + ++/* + // See note on above test for why `should_panic` is used. + #[test] + #[should_panic(expected = "test succeeded")] +@@ -332,3 +333,4 @@ fn array_map_drop_safety() { + assert_eq!(DROPPED.load(Ordering::SeqCst), num_to_create); + panic!("test succeeded") + } ++*/ diff --git a/library/core/tests/num/mod.rs b/library/core/tests/num/mod.rs index a17c094..5bb11d2 100644 --- a/library/core/tests/num/mod.rs diff --git a/rust-toolchain b/rust-toolchain index 79144d2eda6..e3f84f1ce4d 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2020-08-09 +nightly-2020-08-23 diff --git a/src/base.rs b/src/base.rs index 42068dde05d..b83b09baa2b 100644 --- a/src/base.rs +++ b/src/base.rs @@ -760,6 +760,7 @@ fn trans_stmt<'tcx>( _ => fx.tcx.sess.span_fatal(stmt.source_info.span, "Inline assembly is not supported"), } } + StatementKind::Coverage { .. } => fx.tcx.sess.fatal("-Zcoverage is unimplemented"), } } diff --git a/src/constant.rs b/src/constant.rs index 8b0d3b913cb..933694b8292 100644 --- a/src/constant.rs +++ b/src/constant.rs @@ -364,7 +364,7 @@ fn define_all_allocs(tcx: TyCtxt<'_>, module: &mut Module<impl Backend>, cx: &mu data_ctx.set_segment_section("", &*section_name); } - let bytes = alloc.inspect_with_undef_and_ptr_outside_interpreter(0..alloc.len()).to_vec(); + let bytes = alloc.inspect_with_uninit_and_ptr_outside_interpreter(0..alloc.len()).to_vec(); data_ctx.define(bytes.into_boxed_slice()); for &(offset, (_tag, reloc)) in alloc.relocations().iter() { @@ -372,7 +372,7 @@ fn define_all_allocs(tcx: TyCtxt<'_>, module: &mut Module<impl Backend>, cx: &mu let endianness = tcx.data_layout.endian; let offset = offset.bytes() as usize; let ptr_size = tcx.data_layout.pointer_size; - let bytes = &alloc.inspect_with_undef_and_ptr_outside_interpreter(offset..offset + ptr_size.bytes() as usize); + let bytes = &alloc.inspect_with_uninit_and_ptr_outside_interpreter(offset..offset + ptr_size.bytes() as usize); read_target_uint(endianness, bytes).unwrap() }; |