about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbjorn3 <bjorn3@users.noreply.github.com>2022-03-18 20:34:27 +0100
committerbjorn3 <bjorn3@users.noreply.github.com>2022-03-20 21:09:35 +0100
commit1bd90f86447a4b5460d53d412e376d1cc8055d97 (patch)
treef777dae66e455f100071341f94f4298f22c3023a
parentd1904e5855a173416008346be24f42bd4d1794ed (diff)
downloadrust-1bd90f86447a4b5460d53d412e376d1cc8055d97.tar.gz
rust-1bd90f86447a4b5460d53d412e376d1cc8055d97.zip
Don't declare test_variadic_fnptr with two conflicting signatures
It is UB for LLVM and results in a compile error for Cranelift
-rw-r--r--patches/0022-sysroot-Disable-not-compiling-tests.patch20
1 files changed, 0 insertions, 20 deletions
diff --git a/patches/0022-sysroot-Disable-not-compiling-tests.patch b/patches/0022-sysroot-Disable-not-compiling-tests.patch
index 108a97bd7c6..8d9ee3f25c4 100644
--- a/patches/0022-sysroot-Disable-not-compiling-tests.patch
+++ b/patches/0022-sysroot-Disable-not-compiling-tests.patch
@@ -30,25 +30,5 @@ index 0000000..46fd999
 +
 +[dependencies]
 +rand = "0.7"
-diff --git a/library/core/tests/ptr.rs b/library/core/tests/ptr.rs
-index 1a6be3a..42dbd59 100644
---- a/library/core/tests/ptr.rs
-+++ b/library/core/tests/ptr.rs
-@@ -250,6 +250,7 @@ fn test_unsized_nonnull() {
-     };
- }
- 
-+/*
- #[test]
- #[allow(warnings)]
- // Have a symbol for the test below. It doesn’t need to be an actual variadic function, match the
-@@ -277,6 +277,7 @@ pub fn test_variadic_fnptr() {
-     let mut s = SipHasher::new();
-     assert_eq!(p.hash(&mut s), q.hash(&mut s));
- }
-+*/
- 
- #[test]
- fn write_unaligned_drop() {
 --
 2.21.0 (Apple Git-122)