compileopts, targets, main: support Wasmtime v14 (#3972)

ydnar · web-flow · commit 174d49235552 · 2023-11-02T19:49:52.000+01:00
compileopts, targets, main: support Wasmtime v14
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -140,8 +140,8 @@ jobs:
       - name: Install wasmtime
         run: |
           mkdir -p $HOME/.wasmtime $HOME/.wasmtime/bin
-          curl https://github.com/bytecodealliance/wasmtime/releases/download/v13.0.0/wasmtime-v13.0.0-x86_64-linux.tar.xz -o wasmtime-v13.0.0-x86_64-linux.tar.xz -SfL
-          tar -C $HOME/.wasmtime/bin --wildcards -xf wasmtime-v13.0.0-x86_64-linux.tar.xz --strip-components=1 wasmtime-v13.0.0-x86_64-linux/*
+          curl https://github.com/bytecodealliance/wasmtime/releases/download/v14.0.4/wasmtime-v14.0.4-x86_64-linux.tar.xz -o wasmtime-v14.0.4-x86_64-linux.tar.xz -SfL
+          tar -C $HOME/.wasmtime/bin --wildcards -xf wasmtime-v14.0.4-x86_64-linux.tar.xz --strip-components=1 wasmtime-v14.0.4-x86_64-linux/*
           echo "$HOME/.wasmtime/bin" >> $GITHUB_PATH
       - name: Download release artifact
         uses: actions/download-artifact@v3
@@ -187,8 +187,8 @@ jobs:
       - name: Install wasmtime
         run: |
           mkdir -p $HOME/.wasmtime $HOME/.wasmtime/bin
-          curl -L https://github.com/bytecodealliance/wasmtime/releases/download/v13.0.0/wasmtime-v13.0.0-x86_64-linux.tar.xz -o wasmtime-v13.0.0-x86_64-linux.tar.xz -SfL
-          tar -C $HOME/.wasmtime/bin --wildcards -xf wasmtime-v13.0.0-x86_64-linux.tar.xz --strip-components=1 wasmtime-v13.0.0-x86_64-linux/*
+          curl -L https://github.com/bytecodealliance/wasmtime/releases/download/v14.0.4/wasmtime-v14.0.4-x86_64-linux.tar.xz -o wasmtime-v14.0.4-x86_64-linux.tar.xz -SfL
+          tar -C $HOME/.wasmtime/bin --wildcards -xf wasmtime-v14.0.4-x86_64-linux.tar.xz --strip-components=1 wasmtime-v14.0.4-x86_64-linux/*
           echo "$HOME/.wasmtime/bin" >> $GITHUB_PATH
       - name: Restore LLVM source cache
         uses: actions/cache/restore@v3
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -96,7 +96,7 @@ jobs:
         run: make wasi-libc
       - name: Install wasmtime
         run: |
-          scoop install wasmtime@13.0.0
+          scoop install wasmtime@14.0.4
       - name: make gen-device
         run: make -j3 gen-device
       - name: Test TinyGo
@@ -203,7 +203,7 @@ jobs:
       - name: Install Dependencies
         shell: bash
         run: |
-          scoop install binaryen && scoop install wasmtime@13.0.0
+          scoop install binaryen && scoop install wasmtime@14.0.4
       - name: Checkout
         uses: actions/checkout@v3
       - name: Install Go
diff --git a/compileopts/target.go b/compileopts/target.go
@@ -386,7 +386,7 @@ func defaultTarget(goos, goarch, triple string) (*TargetSpec, error) {
 			"--stack-first",
 			"--no-demangle",
 		)
-		spec.Emulator = "wasmtime --mapdir=/tmp::{tmpDir} {}"
+		spec.Emulator = "wasmtime --dir={tmpDir}::/tmp {}"
 		spec.ExtraFiles = append(spec.ExtraFiles,
 			"src/runtime/asm_tinygowasm.S",
 			"src/internal/task/task_asyncify_wasm.S",
diff --git a/main.go b/main.go
@@ -797,7 +797,7 @@ func buildAndRun(pkgName string, config *compileopts.Config, stdout io.Writer, c
 			needsEnvInVars = true
 		}
 	}
-	var args, env []string
+	var args, emuArgs, env []string
 	var extraCmdEnv []string
 	if needsEnvInVars {
 		runtimeGlobals := make(map[string]string)
@@ -820,13 +820,14 @@ func buildAndRun(pkgName string, config *compileopts.Config, stdout io.Writer, c
 	} else if config.EmulatorName() == "wasmtime" {
 		// Wasmtime needs some special flags to pass environment variables
 		// and allow reading from the current directory.
-		args = append(args, "--dir=.")
+		emuArgs = append(emuArgs, "--dir=.")
 		for _, v := range environmentVars {
-			args = append(args, "--env", v)
+			emuArgs = append(emuArgs, "--env", v)
 		}
 		if len(cmdArgs) != 0 {
-			// mark end of wasmtime arguments and start of program ones: --
-			args = append(args, "--")
+			// Use of '--' argument no longer necessary as of Wasmtime v14:
+			// https://github.com/bytecodealliance/wasmtime/pull/6946
+			// args = append(args, "--")
 			args = append(args, cmdArgs...)
 		}
 
@@ -876,7 +877,7 @@ func buildAndRun(pkgName string, config *compileopts.Config, stdout io.Writer, c
 			return result, err
 		}
 		name = emulator[0]
-		emuArgs := append([]string(nil), emulator[1:]...)
+		emuArgs = append(emuArgs, emulator[1:]...)
 		args = append(emuArgs, args...)
 	}
 	var cmd *exec.Cmd
diff --git a/targets/wasi.json b/targets/wasi.json
@@ -22,5 +22,5 @@
 	"extra-files": [
 		"src/runtime/asm_tinygowasm.S"
 	],
-	"emulator":      "wasmtime --mapdir=/tmp::{tmpDir} {}"
+	"emulator":      "wasmtime --dir={tmpDir}::/tmp {}"
 }

Original file line number	Diff line number	Diff line change
`@@ -386,7 +386,7 @@ func defaultTarget(goos, goarch, triple string) (*TargetSpec, error) {`
`386`	`386`	`"--stack-first",`
`387`	`387`	`"--no-demangle",`
`388`	`388`	`)`
`389`		`- spec.Emulator = "wasmtime --mapdir=/tmp::{tmpDir} {}"`
	`389`	`+ spec.Emulator = "wasmtime --dir={tmpDir}::/tmp {}"`
`390`	`390`	`spec.ExtraFiles = append(spec.ExtraFiles,`
`391`	`391`	`"src/runtime/asm_tinygowasm.S",`
`392`	`392`	`"src/internal/task/task_asyncify_wasm.S",`
Original file line number	Diff line number	Diff line change
`@@ -797,7 +797,7 @@ func buildAndRun(pkgName string, config *compileopts.Config, stdout io.Writer, c`
`797`	`797`	`needsEnvInVars = true`
`798`	`798`	`}`
`799`	`799`	`}`
`800`		`- var args, env []string`
	`800`	`+ var args, emuArgs, env []string`
`801`	`801`	`var extraCmdEnv []string`
`802`	`802`	`if needsEnvInVars {`
`803`	`803`	`runtimeGlobals := make(map[string]string)`
`@@ -820,13 +820,14 @@ func buildAndRun(pkgName string, config *compileopts.Config, stdout io.Writer, c`
`820`	`820`	`} else if config.EmulatorName() == "wasmtime" {`
`821`	`821`	`// Wasmtime needs some special flags to pass environment variables`
`822`	`822`	`// and allow reading from the current directory.`
`823`		`- args = append(args, "--dir=.")`
	`823`	`+ emuArgs = append(emuArgs, "--dir=.")`
`824`	`824`	`for _, v := range environmentVars {`
`825`		`- args = append(args, "--env", v)`
	`825`	`+ emuArgs = append(emuArgs, "--env", v)`
`826`	`826`	`}`
`827`	`827`	`if len(cmdArgs) != 0 {`
`828`		`- // mark end of wasmtime arguments and start of program ones: --`
`829`		`- args = append(args, "--")`
	`828`	`+ // Use of '--' argument no longer necessary as of Wasmtime v14:`
	`829`	`+ // https://github.com/bytecodealliance/wasmtime/pull/6946`
	`830`	`+ // args = append(args, "--")`
`830`	`831`	`args = append(args, cmdArgs...)`
`831`	`832`	`}`
`832`	`833`
`@@ -876,7 +877,7 @@ func buildAndRun(pkgName string, config *compileopts.Config, stdout io.Writer, c`
`876`	`877`	`return result, err`
`877`	`878`	`}`
`878`	`879`	`name = emulator[0]`
`879`		`- emuArgs := append([]string(nil), emulator[1:]...)`
	`880`	`+ emuArgs = append(emuArgs, emulator[1:]...)`
`880`	`881`	`args = append(emuArgs, args...)`
`881`	`882`	`}`
`882`	`883`	`var cmd *exec.Cmd`
Original file line number	Diff line number	Diff line change
`@@ -22,5 +22,5 @@`
`22`	`22`	`"extra-files": [`
`23`	`23`	`"src/runtime/asm_tinygowasm.S"`
`24`	`24`	`],`
`25`		`- "emulator": "wasmtime --mapdir=/tmp::{tmpDir} {}"`
	`25`	`+ "emulator": "wasmtime --dir={tmpDir}::/tmp {}"`
`26`	`26`	`}`