Debug

Author: pboyd

.github/workflows/compile.yaml

@@ -8,6 +8,7 @@ on:
 
 jobs:
   test:
+    if: ${{ 0 == 1}}
     name: Check compilation on untested platforms (go ${{ matrix.go-version }})
     runs-on: ubuntu-latest
     timeout-minutes: 10

.github/workflows/test-darwin-arm64.yaml

@@ -0,0 +1,39 @@
+name: Test
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  test:
+    name: Test Darwin (go ${{ matrix.go }}, ${{ matrix.host }})
+    runs-on: ${{ matrix.host }}
+    timeout-minutes: 10
+    strategy:
+      matrix:
+        go: ['1.26']
+        host: ['macos-latest']
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: ${{ matrix.go }}
+          cache: true
+
+      - name: Run tests
+        run: |
+          go test -run 'TestFunc$'
+
+      #- name: Run tests (buildmode=exe)
+      #  run: |
+      #    go test -buildmode=exe ./...
+
+      #- name: Run tests (buildmode=pie)
+      #  run: |
+      #    go test -buildmode=pie ./...

.github/workflows/test-windows-arm.yaml .github/workflows/test-windows-arm64.yaml.github/workflows/test-windows-arm.yaml renamed to .github/workflows/test-windows-arm64.yaml

@@ -8,6 +8,7 @@ on:
 
 jobs:
   test:
+    if: ${{ 0 == 1}}
     name: Test Windows/arm64 (go ${{ matrix.go }}, ${{ matrix.host }})
     runs-on: ${{ matrix.host }}
     timeout-minutes: 10

.github/workflows/test.yaml

@@ -8,6 +8,7 @@ on:
 
 jobs:
   test:
+    if: ${{ 0 == 1}}
     name: Test (go ${{ matrix.go }}, ${{ matrix.host }})
     runs-on: ${{ matrix.host }}
     timeout-minutes: 10

clone.go

@@ -11,6 +11,8 @@ import (
 	"unsafe"
 
 	"github.com/pboyd/malloc"
+
+	"golang.org/x/sys/unix"
 )
 
 // cloneFunc makes a copy of a function that persists after the original
@@ -76,6 +78,11 @@ func (a *allocator) init(startSize int) error {
 			return
 		}
 
+		_, err = be.Grow(nil, 4096)
+		if err != nil {
+			return
+		}
+
 		a.Arena = malloc.NewArena(uint64(startSize), malloc.Backend(be))
 		if a.Arena == nil {
 			err = errors.New("unable to initialize arena")
@@ -135,7 +142,7 @@ func initMallocBackend() (malloc.ArenaBackend, error) {
 		minAddress = absMinAddress
 	}
 	for addr := text - pageSize - size; addr >= minAddress; addr -= 0x100000 {
-		be, err := malloc.VirtBackend(size, malloc.MmapAddr(addr), malloc.MmapProt(mprotectExec), malloc.MmapFlags(_MAP_FIXED_NOREPLACE))
+		be, err := malloc.VirtBackend(size, malloc.MmapAddr(addr), malloc.MmapProt(mprotectExec), malloc.MmapFlags(unix.MAP_JIT|_MAP_FIXED_NOREPLACE))
 		if err == nil {
 			return be, nil
 		}
@@ -148,7 +155,7 @@ func initMallocBackend() (malloc.ArenaBackend, error) {
 		maxAddress = math.MaxUint
 	}
 	for addr := end; addr <= maxAddress; addr += 0x100000 {
-		be, err := malloc.VirtBackend(size, malloc.MmapAddr(addr), malloc.MmapProt(mprotectExec), malloc.MmapFlags(_MAP_FIXED_NOREPLACE))
+		be, err := malloc.VirtBackend(size, malloc.MmapAddr(addr), malloc.MmapProt(mprotectExec), malloc.MmapFlags(unix.MAP_JIT|_MAP_FIXED_NOREPLACE))
 		if err == nil {
 			return be, nil
 		}

redefine.go

@@ -115,7 +115,9 @@ func Original[T any](fn T) T {
 	}
 
 	if clonedType, ok := cloned.(*clonedFunc[T]); ok {
-		return clonedType.Func
+		if clonedType != nil {
+			return clonedType.Func
+		}
 	}
 
 	return *((*T)(nil))
@@ -189,7 +191,7 @@ func unsafeFunc[T any](fn T, newFn any) error {
 
 	err = mprotect(code, mprotectRWX)
 	if err != nil {
-		return err
+		return fmt.Errorf("mprotect: %v", err)
 	}
 	defer mprotect(code, mprotectRX)