From 9edbfed65f5580520df74a87139bd2d61dde4d4f Mon Sep 17 00:00:00 2001
From: Till Schneidereit <till@tillschneidereit.net>
Date: Mon, 26 Aug 2019 13:12:55 +0200
Subject: [PATCH] Switch from mmap to memmap to support Windows

---
 cranelift/filetests/Cargo.toml             |  2 +-
 cranelift/filetests/src/function_runner.rs | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/cranelift/filetests/Cargo.toml b/cranelift/filetests/Cargo.toml
index f5d3220ed9..2b92833070 100644
--- a/cranelift/filetests/Cargo.toml
+++ b/cranelift/filetests/Cargo.toml
@@ -17,6 +17,6 @@ cranelift-preopt = { path = "../cranelift-preopt", version = "0.40.0" }
 file-per-thread-logger = "0.1.2"
 filecheck = "0.4.0"
 log = "0.4.6"
-mmap = "0.1.1"
+memmap = "0.7.0"
 num_cpus = "1.8.0"
 region = "2.1.2"
diff --git a/cranelift/filetests/src/function_runner.rs b/cranelift/filetests/src/function_runner.rs
index dee7320384..954306f5d0 100644
--- a/cranelift/filetests/src/function_runner.rs
+++ b/cranelift/filetests/src/function_runner.rs
@@ -4,7 +4,7 @@ use cranelift_codegen::ir::Function;
 use cranelift_codegen::isa::{CallConv, TargetIsa};
 use cranelift_codegen::{settings, Context};
 use cranelift_native::builder as host_isa_builder;
-use mmap::{MapOption, MemoryMap};
+use memmap::MmapMut;
 use region;
 use region::Protection;
 
@@ -67,19 +67,23 @@ impl FunctionRunner {
         let code_info = context
             .compile(self.isa.as_ref())
             .map_err(|e| e.to_string())?;
-        let code_page = MemoryMap::new(code_info.total_size as usize, &[MapOption::MapWritable])
-            .map_err(|e| e.to_string())?;
+        let mut code_page =
+            MmapMut::map_anon(code_info.total_size as usize).map_err(|e| e.to_string())?;
         let callable_fn: fn() -> bool = unsafe {
             context.emit_to_memory(
                 self.isa.as_ref(),
-                code_page.data(),
+                code_page.as_mut_ptr(),
                 relocs,
                 traps,
                 stackmaps,
             );
-            region::protect(code_page.data(), code_page.len(), Protection::ReadExecute)
-                .map_err(|e| e.to_string())?;
-            mem::transmute(code_page.data())
+            region::protect(
+                code_page.as_mut_ptr(),
+                code_page.len(),
+                Protection::ReadExecute,
+            )
+            .map_err(|e| e.to_string())?;
+            mem::transmute(code_page.as_mut_ptr())
         };
 
         // execute