Merge pull request #1811 from cfallin/fix-warning

Fix build warnings (errors on CI) due to mmap flag rename and deprecation.

Cargo.lock

@@ -1,14 +1,5 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-[[package]]
-name = "addr2line"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a49806b9dadc843c61e7c97e72490ad7f7220ae249012fbda9ad0609457c0543"
-dependencies = [
- "gimli 0.21.0",
-]
-
 [[package]]
 name = "ahash"
 version = "0.2.18"
@@ -94,17 +85,26 @@ checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
 
 [[package]]
 name = "backtrace"
-version = "0.3.48"
+version = "0.3.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0df2f85c8a2abbe3b7d7e748052fdd9b76a0458fdeb16ad4223f5eca78c7c130"
+checksum = "b1e692897359247cc6bb902933361652380af0f1b7651ae5c5013407f30e109e"
 dependencies = [
- "addr2line",
+ "backtrace-sys",
  "cfg-if",
  "libc",
- "object 0.19.0",
  "rustc-demangle",
 ]
 
+[[package]]
+name = "backtrace-sys"
+version = "0.1.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18fbebbe1c9d1f383a9cc7e8ccdb471b91c8d024ee9c2ca5b5346121fe8b4399"
+dependencies = [
+ "cc",
+ "libc",
+]
+
 [[package]]
 name = "base64"
 version = "0.11.0"
@@ -362,7 +362,7 @@ dependencies = [
  "cranelift-codegen-meta",
  "cranelift-codegen-shared",
  "cranelift-entity",
- "gimli 0.20.0",
+ "gimli",
  "hashbrown 0.7.2",
  "log",
  "peepmatic",
@@ -418,7 +418,7 @@ dependencies = [
  "cranelift-reader",
  "file-per-thread-logger",
  "filecheck",
- "gimli 0.20.0",
+ "gimli",
  "log",
  "memmap",
  "num_cpus",
@@ -480,7 +480,7 @@ version = "0.64.0"
 dependencies = [
  "cranelift-codegen",
  "cranelift-module",
- "object 0.18.0",
+ "object",
  "target-lexicon",
 ]
 
@@ -924,12 +924,6 @@ dependencies = [
  "stable_deref_trait",
 ]
 
-[[package]]
-name = "gimli"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcc8e0c9bce37868955864dbecd2b1ab2bdf967e6f28066d65aaac620444b65c"
-
 [[package]]
 name = "glob"
 version = "0.3.0"
@@ -1211,12 +1205,6 @@ dependencies = [
  "target-lexicon",
 ]
 
-[[package]]
-name = "object"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cbca9424c482ee628fa549d9c812e2cd22f1180b9222c9200fdfa6eb31aecb2"
-
 [[package]]
 name = "once_cell"
 version = "1.4.0"
@@ -2257,7 +2245,7 @@ version = "0.17.0"
 dependencies = [
  "anyhow",
  "faerie",
- "gimli 0.20.0",
+ "gimli",
  "more-asserts",
  "target-lexicon",
  "thiserror",
@@ -2339,7 +2327,7 @@ dependencies = [
  "cranelift-frontend",
  "cranelift-native",
  "cranelift-wasm",
- "gimli 0.20.0",
+ "gimli",
  "log",
  "more-asserts",
  "region",
@@ -2369,11 +2357,11 @@ version = "0.17.0"
 dependencies = [
  "anyhow",
  "cfg-if",
- "gimli 0.20.0",
+ "gimli",
  "ittapi-rs",
  "lazy_static",
  "libc",
- "object 0.18.0",
+ "object",
  "scroll",
  "serde",
  "target-lexicon",

cranelift/simplejit/src/memory.rs

@@ -111,7 +111,7 @@ impl Drop for PtrLen {
     fn drop(&mut self) {
         if !self.ptr.is_null() {
             unsafe {
-                region::protect(self.ptr, self.len, region::Protection::ReadWrite)
+                region::protect(self.ptr, self.len, region::Protection::READ_WRITE)
                     .expect("unable to unprotect memory");
                 libc::free(self.ptr as _);
             }
@@ -179,7 +179,7 @@ impl Memory {
             for &PtrLen { ref map, ptr, len } in &self.allocations[self.executable..] {
                 if len != 0 && map.is_some() {
                     unsafe {
-                        region::protect(ptr, len, region::Protection::ReadExecute)
+                        region::protect(ptr, len, region::Protection::READ_EXECUTE)
                             .expect("unable to make memory readable+executable");
                     }
                 }
@@ -191,7 +191,7 @@ impl Memory {
             for &PtrLen { ptr, len } in &self.allocations[self.executable..] {
                 if len != 0 {
                     unsafe {
-                        region::protect(ptr, len, region::Protection::ReadExecute)
+                        region::protect(ptr, len, region::Protection::READ_EXECUTE)
                             .expect("unable to make memory readable+executable");
                     }
                 }
@@ -208,7 +208,7 @@ impl Memory {
             for &PtrLen { ref map, ptr, len } in &self.allocations[self.executable..] {
                 if len != 0 && map.is_some() {
                     unsafe {
-                        region::protect(ptr, len, region::Protection::Read)
+                        region::protect(ptr, len, region::Protection::READ)
                             .expect("unable to make memory readonly");
                     }
                 }
@@ -220,7 +220,7 @@ impl Memory {
             for &PtrLen { ptr, len } in &self.allocations[self.executable..] {
                 if len != 0 {
                     unsafe {
-                        region::protect(ptr, len, region::Protection::Read)
+                        region::protect(ptr, len, region::Protection::READ)
                             .expect("unable to make memory readonly");
                     }
                 }

crates/jit/src/code_memory.rs

@@ -120,7 +120,7 @@ impl CodeMemory {
 
             if !m.is_empty() {
                 unsafe {
-                    region::protect(m.as_mut_ptr(), m.len(), region::Protection::ReadExecute)
+                    region::protect(m.as_mut_ptr(), m.len(), region::Protection::READ_EXECUTE)
                 }
                 .expect("unable to make memory readonly and executable");
             }

crates/runtime/src/mmap.rs

@@ -182,7 +182,7 @@ impl Mmap {
 
         // Commit the accessible size.
         let ptr = self.ptr as *const u8;
-        unsafe { region::protect(ptr.add(start), len, region::Protection::ReadWrite) }
+        unsafe { region::protect(ptr.add(start), len, region::Protection::READ_WRITE) }
             .map_err(|e| e.to_string())
     }