Fixes for TinyGo 0.26.0 (#9)

Signed-off-by: Takeshi Yoneda <takeshi@tetrate.io>
knqyf263 · Nov 20, 2022 · 83330ad · 83330ad
1 parent 708a56d
commit 83330ad
Show file tree

Hide file tree

Showing 12 changed files with 53 additions and 7 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -11,11 +11,19 @@ on:
 env:
   GO_VERSION: "1.18"
   PROTOC_VERSION: "21.5"
-  TINYGO_VERSION: "0.24.0"
+
 jobs:
   test:
-    name: Test
+    name: Test (TinyGo ${{ matrix.tinygo-version }})
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        tinygo-version:
+          - "0.24.0"
+          - "0.25.0"
+          - "0.26.0"
+
     steps:
       - uses: actions/checkout@v3
 
@@ -41,8 +49,8 @@ jobs:
 
       - name: Install TinyGo
         run: |
-          wget https://github.com/tinygo-org/tinygo/releases/download/v${TINYGO_VERSION}/tinygo_${TINYGO_VERSION}_amd64.deb
-          sudo dpkg -i tinygo_${TINYGO_VERSION}_amd64.deb
+          wget https://github.com/tinygo-org/tinygo/releases/download/v${{ matrix.tinygo-version }}/tinygo_${{ matrix.tinygo-version }}_amd64.deb
+          sudo dpkg -i tinygo_${{ matrix.tinygo-version }}_amd64.deb
 
       - name: Run unit tests
-        run: make test
+        run: make test
diff --git a/examples/helloworld/greeting/greet_host.pb.go b/examples/helloworld/greeting/greet_host.pb.go
diff --git a/examples/host-functions/greeting/greet_host.pb.go b/examples/host-functions/greeting/greet_host.pb.go
diff --git a/examples/known-types/known/known_host.pb.go b/examples/known-types/known/known_host.pb.go
diff --git a/examples/wasi/cat/cat_host.pb.go b/examples/wasi/cat/cat_host.pb.go
diff --git a/gen/host.go b/gen/host.go
@@ -289,7 +289,9 @@ func genPluginMethod(g *protogen.GeneratedFile, f *fileInfo, method *protogen.Me
 	g.P("data, err := request.MarshalVT()")
 	g.P(errorHandling)
 	g.P("dataSize := uint64(len(data))")
-
+	g.P(`if dataSize == 0 {
+			return response, nil 
+		}`)
 	g.P("results, err := p.malloc.Call(ctx, dataSize)")
 	g.P(errorHandling)
 

diff --git a/tests/fields/proto/fields_host.pb.go b/tests/fields/proto/fields_host.pb.go
diff --git a/tests/host-functions/proto/host_host.pb.go b/tests/host-functions/proto/host_host.pb.go
diff --git a/tests/import/proto/bar/bar_host.pb.go b/tests/import/proto/bar/bar_host.pb.go
diff --git a/tests/import/proto/foo/foo_host.pb.go b/tests/import/proto/foo/foo_host.pb.go
diff --git a/tests/well-known/proto/known_host.pb.go b/tests/well-known/proto/known_host.pb.go
diff --git a/wasm/host.go b/wasm/host.go
@@ -25,7 +25,13 @@ func WriteMemory(ctx context.Context, m api.Module, data []byte) (uint64, error)
 	if malloc == nil {
 		return 0, errors.New("malloc is not exported")
 	}
-	results, err := malloc.Call(ctx, uint64(len(data)))
+
+	l := uint64(len(data))
+	if l == 0 {
+		return 0, nil
+	}
+
+	results, err := malloc.Call(ctx, l)
 	if err != nil {
 		return 0, err
 	}