From d7a7401bb7edbed6b8667bc459135aa2f2ea10d8 Mon Sep 17 00:00:00 2001
From: Wenyu Zhao <wenyu.zhao@anu.edu.au>
Date: Wed, 13 Mar 2024 22:25:13 +1100
Subject: [PATCH] Fix test errors

---
 mallockit/src/malloc.rs  | 6 +++---
 mallockit/src/mutator.rs | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/mallockit/src/malloc.rs b/mallockit/src/malloc.rs
index 7ff5c66..b317877 100644
--- a/mallockit/src/malloc.rs
+++ b/mallockit/src/malloc.rs
@@ -54,7 +54,7 @@ impl<P: Plan> MallocAPI<P> {
     pub unsafe fn malloc_size(&self, ptr: Address) -> usize {
         let ptr = Address::from(ptr);
         #[cfg(target_os = "macos")]
-        if Self::is_in_mallockit_heap(ptr.into()) {
+        if !Self::is_in_mallockit_heap(ptr.into()) {
             return crate::util::macos_malloc_zone::external_memory_size(ptr);
         }
         P::get_layout(ptr).size()
@@ -85,7 +85,7 @@ impl<P: Plan> MallocAPI<P> {
             return;
         }
         #[cfg(target_os = "macos")]
-        if Self::is_in_mallockit_heap(ptr.into()) {
+        if !Self::is_in_mallockit_heap(ptr.into()) {
             return;
         }
         self.mutator().dealloc(ptr.into());
@@ -108,7 +108,7 @@ impl<P: Plan> MallocAPI<P> {
         let new_size = Self::align_up(new_size, Self::MIN_ALIGNMENT);
 
         #[cfg(target_os = "macos")]
-        if Self::is_in_mallockit_heap(ptr.into()) {
+        if !Self::is_in_mallockit_heap(ptr.into()) {
             let ptr = Address::from(ptr);
             let old_size = crate::util::macos_malloc_zone::external_memory_size(ptr);
             let new_layout =
diff --git a/mallockit/src/mutator.rs b/mallockit/src/mutator.rs
index cf31f47..f72ca6c 100644
--- a/mallockit/src/mutator.rs
+++ b/mallockit/src/mutator.rs
@@ -91,6 +91,10 @@ pub trait TLS: Sized {
     }
 }
 
+impl TLS for u8 {
+    const NEW: Self = 0;
+}
+
 #[cfg(target_os = "macos")]
 mod macos_tls {
     use spin::{mutex::Mutex, Yield};
@@ -111,9 +115,6 @@ mod macos_tls {
     #[cfg(test)]
     #[no_mangle]
     extern "C" fn mallockit_initialize_macos_tls() -> *mut u8 {
-        impl TLS for u8 {
-            const NEW: Self = 0;
-        }
         get_tls::<u8>()
     }