Enable warnings if pooling-allocator is disabled (#10142)

* Enable warnings if `pooling-allocator` is disabled

Continuation of work in #10131

* Fix windows build

Author: alexcrichton

crates/wasmtime/src/lib.rs

@@ -290,7 +290,6 @@
         not(feature = "gc-drc"),
         not(feature = "gc-null"),
         not(feature = "cranelift"),
-        not(feature = "pooling-allocator"),
         not(feature = "runtime"),
         not(feature = "std"),
     ),

crates/wasmtime/src/runtime/vm.rs

@@ -350,6 +350,7 @@ impl ModuleRuntimeInfo {
     /// A unique ID for this particular module. This can be used to
     /// allow for fastpaths to optimize a "re-instantiate the same
     /// module again" case.
+    #[cfg(feature = "pooling-allocator")]
     fn unique_id(&self) -> Option<CompiledModuleId> {
         match self {
             ModuleRuntimeInfo::Module(m) => Some(m.id()),

crates/wasmtime/src/runtime/vm/instance/allocator.rs

@@ -74,6 +74,13 @@ pub struct InstanceAllocationRequest<'a> {
 
     /// Request that the instance's memories be protected by a specific
     /// protection key.
+    #[cfg_attr(
+        not(feature = "pooling-allocator"),
+        expect(
+            dead_code,
+            reason = "easier to keep this field than remove it, not perf-critical to remove"
+        )
+    )]
     pub pkey: Option<ProtectionKey>,
 
     /// Tunable configuration options the engine is using.
@@ -126,6 +133,7 @@ impl Default for MemoryAllocationIndex {
 
 impl MemoryAllocationIndex {
     /// Get the underlying index of this `MemoryAllocationIndex`.
+    #[cfg(feature = "pooling-allocator")]
     pub fn index(&self) -> usize {
         self.0 as usize
     }
@@ -145,6 +153,7 @@ impl Default for TableAllocationIndex {
 
 impl TableAllocationIndex {
     /// Get the underlying index of this `TableAllocationIndex`.
+    #[cfg(feature = "pooling-allocator")]
     pub fn index(&self) -> usize {
         self.0 as usize
     }

crates/wasmtime/src/runtime/vm/memory.rs

@@ -94,7 +94,9 @@ pub use self::mmap::MmapMemory;
 mod malloc;
 pub use self::malloc::MallocMemory;
 
+#[cfg(feature = "pooling-allocator")]
 mod static_;
+#[cfg(feature = "pooling-allocator")]
 use self::static_::StaticMemory;
 
 #[cfg(feature = "threads")]
@@ -244,6 +246,7 @@ impl Memory {
     }
 
     /// Create a new static (immovable) memory instance for the specified plan.
+    #[cfg(feature = "pooling-allocator")]
     pub fn new_static(
         ty: &wasmtime_environ::Memory,
         tunables: &Tunables,
@@ -732,6 +735,7 @@ impl LocalMemory {
         base..end
     }
 
+    #[cfg(feature = "pooling-allocator")]
     pub fn unwrap_static_image(self) -> MemoryImageSlot {
         self.memory_image.unwrap()
     }

crates/wasmtime/src/runtime/vm/mpk/disabled.rs

@@ -3,14 +3,19 @@
 
 #![allow(missing_docs)]
 
+#[cfg(feature = "pooling-allocator")]
 use crate::prelude::*;
 
+#[cfg(feature = "pooling-allocator")]
 pub fn is_supported() -> bool {
     false
 }
+
+#[cfg(feature = "pooling-allocator")]
 pub fn keys(_: usize) -> &'static [ProtectionKey] {
     &[]
 }
+
 pub fn allow(_: ProtectionMask) {}
 
 pub fn current_mask() -> ProtectionMask {
@@ -20,9 +25,11 @@ pub fn current_mask() -> ProtectionMask {
 #[derive(Clone, Copy, Debug)]
 pub enum ProtectionKey {}
 impl ProtectionKey {
+    #[cfg(feature = "pooling-allocator")]
     pub fn protect(&self, _: &mut [u8]) -> Result<()> {
         match *self {}
     }
+    #[cfg(feature = "pooling-allocator")]
     pub fn as_stripe(&self) -> usize {
         match *self {}
     }
@@ -34,9 +41,11 @@ impl ProtectionMask {
     pub fn all() -> Self {
         Self
     }
+    #[cfg(feature = "pooling-allocator")]
     pub fn zero() -> Self {
         Self
     }
+    #[cfg(feature = "pooling-allocator")]
     pub fn or(self, _: ProtectionKey) -> Self {
         Self
     }

crates/wasmtime/src/runtime/vm/mpk/mod.rs

@@ -39,9 +39,9 @@ cfg_if::cfg_if! {
         mod enabled;
         mod pkru;
         mod sys;
-        pub use enabled::{allow, current_mask, is_supported, keys, ProtectionKey, ProtectionMask};
+        pub use enabled::*;
     } else {
         mod disabled;
-        pub use disabled::{allow, current_mask, is_supported, keys, ProtectionKey, ProtectionMask};
+        pub use disabled::*;
     }
 }

crates/wasmtime/src/runtime/vm/sys/unix/vm.rs

@@ -34,6 +34,7 @@ pub unsafe fn commit_pages(_addr: *mut u8, _len: usize) -> io::Result<()> {
     Ok(())
 }
 
+#[cfg(feature = "pooling-allocator")]
 pub unsafe fn decommit_pages(addr: *mut u8, len: usize) -> io::Result<()> {
     if len == 0 {
         return Ok(());

crates/wasmtime/src/runtime/vm/sys/windows/vm.rs

@@ -37,6 +37,7 @@ pub unsafe fn commit_pages(addr: *mut u8, len: usize) -> io::Result<()> {
     expose_existing_mapping(addr, len)
 }
 
+#[cfg(feature = "pooling-allocator")]
 pub unsafe fn decommit_pages(addr: *mut u8, len: usize) -> io::Result<()> {
     erase_existing_mapping(addr, len)
 }