Auto merge of #809 - RalfJung:intptrcast, r=<try>

use intptrcast for heap_allocator test; then it should work on Windows

Author: bors

.appveyor.yml

@@ -31,6 +31,7 @@ install:
 build_script:
     - set RUST_TEST_NOCAPTURE=1
     - set RUST_BACKTRACE=1
+    - set MIRI_BACKTRACE=1
     - set RUSTFLAGS=-C debug-assertions
     # Build and install miri
     - cargo build --release --all-features --all-targets
@@ -41,7 +42,7 @@ build_script:
 
 test_script:
     # Test miri
-    - cargo test --release --all-features
+    - cargo test --release --all-features heap
     # Test cargo integration
     - cd test-cargo-miri
     - '"C:\msys64\mingw64\bin\python3.exe" run-test.py'

tests/run-pass/heap_allocator.rs

@@ -1,3 +1,4 @@
+// compile-flag: -Zmiri-seed=
 #![feature(allocator_api)]
 
 use std::ptr::NonNull;
@@ -32,14 +33,15 @@ fn check_overalign_requests<T: Alloc>(mut allocator: T) {
     let size = 8;
     // Greater than `size`.
     let align = 16;
-    // Miri is deterministic; no need to try many times.
-    let iterations = 1;
+
+    let iterations = 5;
     unsafe {
         let pointers: Vec<_> = (0..iterations).map(|_| {
             allocator.alloc(Layout::from_size_align(size, align).unwrap()).unwrap()
         }).collect();
         for &ptr in &pointers {
-            assert_eq!((ptr.as_ptr() as usize) % align, 0,
+            let ptr = ptr.as_ptr() as usize;
+            assert_eq!(ptr % align, 0,
                        "Got a pointer less aligned than requested")
         }
 
@@ -75,7 +77,6 @@ fn box_to_global() {
 fn main() {
     check_alloc(System);
     check_alloc(Global);
-    #[cfg(not(target_os = "windows"))] // TODO: Inspects allocation base address on Windows; needs intptrcast model
     check_overalign_requests(System);
     check_overalign_requests(Global);
     global_to_box();