From 3f99ad175a745bcb49eeef64675f1fa48d84016d Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Sat, 8 Jun 2019 20:35:59 +0200
Subject: [PATCH] extra paranoid mode

---
 src/test/run-pass/consts/const-ptr-nonnull.rs | 5 +++--
 src/test/run-pass/consts/const-ptr-unique.rs  | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/test/run-pass/consts/const-ptr-nonnull.rs b/src/test/run-pass/consts/const-ptr-nonnull.rs
index 12a5ea5b480b..67d52ad08246 100644
--- a/src/test/run-pass/consts/const-ptr-nonnull.rs
+++ b/src/test/run-pass/consts/const-ptr-nonnull.rs
@@ -11,6 +11,7 @@ const DANGLING: NonNull<u32> = NonNull::dangling();
 const CASTED: NonNull<u32> = NonNull::cast(NonNull::<i32>::dangling());
 
 pub fn main() {
-    assert_eq!(DANGLING, b(NonNull::dangling)());
-    assert_eq!(CASTED, b(NonNull::dangling)());
+    // Be super-extra paranoid and cast the fn items to fn pointers before blackboxing them.
+    assert_eq!(DANGLING, b::<fn() -> _>(NonNull::dangling)());
+    assert_eq!(CASTED, b::<fn() -> _>(NonNull::dangling)());
 }
diff --git a/src/test/run-pass/consts/const-ptr-unique.rs b/src/test/run-pass/consts/const-ptr-unique.rs
index be3ea193fa4e..e8735e1a32c2 100644
--- a/src/test/run-pass/consts/const-ptr-unique.rs
+++ b/src/test/run-pass/consts/const-ptr-unique.rs
@@ -11,5 +11,6 @@ use std::ptr::Unique;
 const PTR: *mut u32 = Unique::empty().as_ptr();
 
 pub fn main() {
-    assert_eq!(PTR, b(Unique::<u32>::empty)().as_ptr());
+    // Be super-extra paranoid and cast the fn items to fn pointers before blackboxing them.
+    assert_eq!(PTR, b::<fn() -> _>(Unique::<u32>::empty)().as_ptr());
 }