diff options
| author | bors <bors@rust-lang.org> | 2020-10-25 14:17:26 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-10-25 14:17:26 +0000 |
| commit | 430feb24a46993e5073c1bb1b39da190d83fa2bf (patch) | |
| tree | e1615de3fc8132c099f4194246c3a2a8211c8f3a | |
| parent | f392479de6b003e72f93cb8f9955b3cf4135c2cd (diff) | |
| parent | d3369e621022e23bfd65dfe48ae669af4a380ac5 (diff) | |
| download | rust-430feb24a46993e5073c1bb1b39da190d83fa2bf.tar.gz rust-430feb24a46993e5073c1bb1b39da190d83fa2bf.zip | |
Auto merge of #78253 - Aaron1011:bump-llvm-deadarg, r=cuviper
Bump LLVM for DeadArgElim fix Fixes #76387 Pulls in https://github.com/rust-lang/llvm-project/pull/82
| m--------- | src/llvm-project | 0 | ||||
| -rw-r--r-- | src/test/ui/auxiliary/issue-76387.rs | 29 | ||||
| -rw-r--r-- | src/test/ui/issue-76387-llvm-miscompile.rs | 22 |
3 files changed, 51 insertions, 0 deletions
diff --git a/src/llvm-project b/src/llvm-project -Subproject 655a1467c98741e332b87661a9046877077ef4d +Subproject ee1617457899ef2eb55dcf7ee2758b4340b6533 diff --git a/src/test/ui/auxiliary/issue-76387.rs b/src/test/ui/auxiliary/issue-76387.rs new file mode 100644 index 00000000000..873d2bedd4d --- /dev/null +++ b/src/test/ui/auxiliary/issue-76387.rs @@ -0,0 +1,29 @@ +// compile-flags: -C opt-level=3 + +pub struct FatPtr { + ptr: *mut u8, + len: usize, +} + +impl FatPtr { + pub fn new(len: usize) -> FatPtr { + let ptr = Box::into_raw(vec![42u8; len].into_boxed_slice()) as *mut u8; + + FatPtr { ptr, len } + } +} + +impl std::ops::Deref for FatPtr { + type Target = [u8]; + + #[inline] + fn deref(&self) -> &[u8] { + unsafe { std::slice::from_raw_parts(self.ptr, self.len) } + } +} + +impl std::ops::Drop for FatPtr { + fn drop(&mut self) { + println!("Drop"); + } +} diff --git a/src/test/ui/issue-76387-llvm-miscompile.rs b/src/test/ui/issue-76387-llvm-miscompile.rs new file mode 100644 index 00000000000..a9b4686c970 --- /dev/null +++ b/src/test/ui/issue-76387-llvm-miscompile.rs @@ -0,0 +1,22 @@ +// no-system-llvm +// compile-flags: -C opt-level=3 +// aux-build: issue-76387.rs +// run-pass + +// Regression test for issue #76387 +// Tests that LLVM doesn't miscompile this + +extern crate issue_76387; + +use issue_76387::FatPtr; + +fn print(data: &[u8]) { + println!("{:#?}", data); +} + +fn main() { + let ptr = FatPtr::new(20); + let data = unsafe { std::slice::from_raw_parts(ptr.as_ptr(), ptr.len()) }; + + print(data); +} |
