From e3168167db5e4d3c34829baa96ab967e3410a99c Mon Sep 17 00:00:00 2001
From: Quinton Miller <nicetas.c@gmail.com>
Date: Thu, 7 Nov 2024 21:31:36 +0800
Subject: [PATCH] Use Win32 heap functions with `-Dgc_none`

---
 src/gc/none.cr                             | 39 ++++++++++++++++++----
 src/lib_c/x86_64-windows-msvc/c/heapapi.cr |  2 ++
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/src/gc/none.cr b/src/gc/none.cr
index ce84027e6e69..651027266e5b 100644
--- a/src/gc/none.cr
+++ b/src/gc/none.cr
@@ -1,5 +1,6 @@
 {% if flag?(:win32) %}
   require "c/process"
+  require "c/heapapi"
 {% end %}
 require "crystal/tracing"
 
@@ -11,21 +12,42 @@ module GC
   # :nodoc:
   def self.malloc(size : LibC::SizeT) : Void*
     Crystal.trace :gc, "malloc", size: size
-    # libc malloc is not guaranteed to return cleared memory, so we need to
-    # explicitly clear it. Ref: https://github.com/crystal-lang/crystal/issues/14678
-    LibC.malloc(size).tap(&.clear)
+
+    {% if flag?(:win32) %}
+      LibC.HeapAlloc(LibC.GetProcessHeap, LibC::HEAP_ZERO_MEMORY, size)
+    {% else %}
+      # libc malloc is not guaranteed to return cleared memory, so we need to
+      # explicitly clear it. Ref: https://github.com/crystal-lang/crystal/issues/14678
+      LibC.malloc(size).tap(&.clear)
+    {% end %}
   end
 
   # :nodoc:
   def self.malloc_atomic(size : LibC::SizeT) : Void*
     Crystal.trace :gc, "malloc", size: size, atomic: 1
-    LibC.malloc(size)
+
+    {% if flag?(:win32) %}
+      LibC.HeapAlloc(LibC.GetProcessHeap, 0, size)
+    {% else %}
+      LibC.malloc(size)
+    {% end %}
   end
 
   # :nodoc:
   def self.realloc(pointer : Void*, size : LibC::SizeT) : Void*
     Crystal.trace :gc, "realloc", size: size
-    LibC.realloc(pointer, size)
+
+    {% if flag?(:win32) %}
+      # realloc with a null pointer should behave like plain malloc, but Win32
+      # doesn't do that
+      if pointer
+        LibC.HeapReAlloc(LibC.GetProcessHeap, LibC::HEAP_ZERO_MEMORY, pointer, size)
+      else
+        LibC.HeapAlloc(LibC.GetProcessHeap, LibC::HEAP_ZERO_MEMORY, size)
+      end
+    {% else %}
+      LibC.realloc(pointer, size)
+    {% end %}
   end
 
   def self.collect
@@ -39,7 +61,12 @@ module GC
 
   def self.free(pointer : Void*) : Nil
     Crystal.trace :gc, "free"
-    LibC.free(pointer)
+
+    {% if flag?(:win32) %}
+      LibC.HeapFree(LibC.GetProcessHeap, 0, pointer)
+    {% else %}
+      LibC.free(pointer)
+    {% end %}
   end
 
   def self.is_heap_ptr(pointer : Void*) : Bool
diff --git a/src/lib_c/x86_64-windows-msvc/c/heapapi.cr b/src/lib_c/x86_64-windows-msvc/c/heapapi.cr
index 1738cf774cac..8db5152585bc 100644
--- a/src/lib_c/x86_64-windows-msvc/c/heapapi.cr
+++ b/src/lib_c/x86_64-windows-msvc/c/heapapi.cr
@@ -1,6 +1,8 @@
 require "c/winnt"
 
 lib LibC
+  HEAP_ZERO_MEMORY = 0x00000008
+
   fun GetProcessHeap : HANDLE
   fun HeapAlloc(hHeap : HANDLE, dwFlags : DWORD, dwBytes : SizeT) : Void*
   fun HeapReAlloc(hHeap : HANDLE, dwFlags : DWORD, lpMem : Void*, dwBytes : SizeT) : Void*