Revert tinygo reflect.SliceHeader specialization (#2210)

Signed-off-by: Nuno Cruces <[email protected]>
tetratelabs · Jun 18, 2024 · f902fb4 · f902fb4
1 parent c6ffc9e
commit f902fb4
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 57 deletions.
diff --git a/.github/workflows/commit.yaml b/.github/workflows/commit.yaml
@@ -163,7 +163,7 @@ jobs:
           go-version: "1.22"
       - uses: acifani/setup-tinygo@v2
         with:
-          tinygo-version: "0.31.2"
+          tinygo-version: "0.32.0"
       - run: tinygo build ./cmd/wazero
       - run: tinygo build -size short -target pico -stack-size=8kb ./cmd/wazero
 

diff --git a/.github/workflows/examples.yaml b/.github/workflows/examples.yaml
@@ -17,7 +17,7 @@ on:
 
 env:
   EMSDK_VERSION: "3.1.40"
-  TINYGO_VERSION: "0.31.0"
+  TINYGO_VERSION: "0.32.0"
   ZIG_VERSION: "0.11.0"
 
 concurrency:
@@ -84,6 +84,7 @@ jobs:
 
       - name: Build TinyGo examples
         run: make build.examples.tinygo
+        if: matrix.go-version != '1.20' # fails with TinyGo v0.32.0
 
       - name: Build AssemblyScript examples
         run: make build.examples.as
@@ -105,6 +106,7 @@ jobs:
 
       - name: Build bench cases
         run: make build.bench
+        if: matrix.go-version != '1.20' # fails with TinyGo v0.32.0
 
       - name: Run example tests
         run: make test.examples
diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
@@ -19,7 +19,7 @@ defaults:
 
 env:  # Update this prior to requiring a higher minor version in go.mod
   GO_VERSION: "1.22"
-  TINYGO_VERSION: "0.31.0"
+  TINYGO_VERSION: "0.32.0"
   ZIG_VERSION: "0.11.0"
   BINARYEN_VERSION: "116"
   STDLIB_TESTS: "internal/integration_test/stdlibs"

diff --git a/internal/engine/wazevo/backend/isa/amd64/reflect.go b/internal/engine/wazevo/backend/isa/amd64/reflect.go
diff --git a/internal/engine/wazevo/backend/isa/amd64/reflect_tinygo.go b/internal/engine/wazevo/backend/isa/amd64/reflect_tinygo.go
diff --git a/internal/engine/wazevo/backend/isa/amd64/stack.go b/internal/engine/wazevo/backend/isa/amd64/stack.go
@@ -9,12 +9,13 @@ import (
 )
 
 func stackView(rbp, top uintptr) []byte {
+	l := int(top - rbp)
 	var stackBuf []byte
 	{
-		// TODO: use unsafe.Slice after floor version is set to Go 1.20.
 		hdr := (*reflect.SliceHeader)(unsafe.Pointer(&stackBuf))
 		hdr.Data = rbp
-		setSliceLimits(hdr, top-rbp)
+		hdr.Len = l
+		hdr.Cap = l
 	}
 	return stackBuf
 }
@@ -72,7 +73,7 @@ func GoCallStackView(stackPointerBeforeGoCall *uint64) []uint64 {
 	//              |   SizeInBytes   |
 	//              +-----------------+ <---- stackPointerBeforeGoCall
 	//                 (low address)
-	data := unsafe.Pointer(uintptr(unsafe.Pointer(stackPointerBeforeGoCall)) + 8)
+	data := unsafe.Add(unsafe.Pointer(stackPointerBeforeGoCall), 8)
 	size := *stackPointerBeforeGoCall / 8
 	return unsafe.Slice((*uint64)(data), int(size))
 }

diff --git a/internal/engine/wazevo/backend/isa/arm64/unwind_stack.go b/internal/engine/wazevo/backend/isa/arm64/unwind_stack.go
@@ -14,7 +14,6 @@ func UnwindStack(sp, _, top uintptr, returnAddresses []uintptr) []uintptr {
 
 	var stackBuf []byte
 	{
-		// TODO: use unsafe.Slice after floor version is set to Go 1.20.
 		hdr := (*reflect.SliceHeader)(unsafe.Pointer(&stackBuf))
 		hdr.Data = sp
 		hdr.Len = l

diff --git a/internal/engine/wazevo/call_engine.go b/internal/engine/wazevo/call_engine.go
@@ -556,15 +556,17 @@ func (c *callEngine) cloneStack(l uintptr) (newSP, newFP, newTop uintptr, newSta
 	{
 		sh := (*reflect.SliceHeader)(unsafe.Pointer(&prevStackAligned))
 		sh.Data = c.stackTop - relSp
-		setSliceLimits(sh, relSp, relSp)
+		sh.Len = int(relSp)
+		sh.Cap = int(relSp)
 	}
 	newTop = alignedStackTop(newStack)
 	{
 		newSP = newTop - relSp
 		newFP = newTop - relFp
 		sh := (*reflect.SliceHeader)(unsafe.Pointer(&newStackAligned))
 		sh.Data = newSP
-		setSliceLimits(sh, relSp, relSp)
+		sh.Len = int(relSp)
+		sh.Cap = int(relSp)
 	}
 	copy(newStackAligned, prevStackAligned)
 	return

diff --git a/internal/engine/wazevo/engine_test.go b/internal/engine/wazevo/engine_test.go
@@ -189,7 +189,6 @@ func TestCompiledModule_functionIndexOf(t *testing.T) {
 	const executableAddr = 0xaaaa
 	var executable []byte
 	{
-		// TODO: use unsafe.Slice after floor version is set to Go 1.20.
 		hdr := (*reflect.SliceHeader)(unsafe.Pointer(&executable))
 		hdr.Data = executableAddr
 		hdr.Len = 0xffff

diff --git a/internal/engine/wazevo/hostmodule.go b/internal/engine/wazevo/hostmodule.go
@@ -53,7 +53,8 @@ func hostModuleListenersSliceFromOpaque(opaqueBegin uintptr) []experimental.Func
 	var ret []experimental.FunctionListener
 	sh = (*reflect.SliceHeader)(unsafe.Pointer(&ret))
 	sh.Data = uintptr(b)
-	setSliceLimits(sh, uintptr(l), uintptr(c))
+	sh.Len = int(l)
+	sh.Cap = int(c)
 	return ret
 }
 

diff --git a/internal/engine/wazevo/reflect.go b/internal/engine/wazevo/reflect.go
diff --git a/internal/engine/wazevo/reflect_tinygo.go b/internal/engine/wazevo/reflect_tinygo.go
diff --git a/internal/integration_test/fuzz/wazerolib/extern.go b/internal/integration_test/fuzz/wazerolib/extern.go
@@ -22,7 +22,6 @@ func main() {}
 //
 //export require_no_diff
 func require_no_diff(binaryPtr uintptr, binarySize int, checkMemory bool, checkLogging bool) {
-	// TODO: use unsafe.Slice after flooring Go 1.20.
 	var wasmBin []byte
 	wasmHdr := (*reflect.SliceHeader)(unsafe.Pointer(&wasmBin))
 	wasmHdr.Data = binaryPtr
@@ -51,7 +50,6 @@ func require_no_diff(binaryPtr uintptr, binarySize int, checkMemory bool, checkL
 //
 //export validate
 func validate(binaryPtr uintptr, binarySize int) {
-	// TODO: use unsafe.Slice after flooring Go 1.20.
 	var wasmBin []byte
 	wasmHdr := (*reflect.SliceHeader)(unsafe.Pointer(&wasmBin))
 	wasmHdr.Data = binaryPtr