aboutsummaryrefslogtreecommitdiff
path: root/misc/cgo/errors
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@golang.org>2019-07-11 11:57:31 -0700
committerIan Lance Taylor <iant@golang.org>2019-07-12 17:31:29 +0000
commite831719469a5acfad7d8f73a976e2959815d0e27 (patch)
tree11f0bac79bc77ec1a7c7e8d3d6afed658dc92066 /misc/cgo/errors
parent7942671a5856233ce63a265e1a1441b7a0ea82f5 (diff)
downloadgo-e831719469a5acfad7d8f73a976e2959815d0e27.tar.xz
cmd/cgo: do not rewrite call if there are more args than parameters
We already skipped rewriting the call if there were fewer args than parameters. But we can also get a cgo crash if there are more args, if at least one of the extra args uses a name qualified with "C.". Skip the rewrite, since the build will fail later anyhow. Fixes #33061 Change-Id: I62ff3518b775b502ad10c2bacf9102db4c9a531c Reviewed-on: https://go-review.googlesource.com/c/go/+/185797 Run-TryBot: Ian Lance Taylor <iant@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Andrew Bonventre <andybons@golang.org>
Diffstat (limited to 'misc/cgo/errors')
-rw-r--r--misc/cgo/errors/errors_test.go1
-rw-r--r--misc/cgo/errors/testdata/issue33061.go17
2 files changed, 18 insertions, 0 deletions
diff --git a/misc/cgo/errors/errors_test.go b/misc/cgo/errors/errors_test.go
index e6bac0fff4..1bdf843451 100644
--- a/misc/cgo/errors/errors_test.go
+++ b/misc/cgo/errors/errors_test.go
@@ -112,6 +112,7 @@ func TestReportsTypeErrors(t *testing.T) {
"issue18452.go",
"issue18889.go",
"issue28721.go",
+ "issue33061.go",
} {
check(t, file)
}
diff --git a/misc/cgo/errors/testdata/issue33061.go b/misc/cgo/errors/testdata/issue33061.go
new file mode 100644
index 0000000000..77d5f7a7c9
--- /dev/null
+++ b/misc/cgo/errors/testdata/issue33061.go
@@ -0,0 +1,17 @@
+// Copyright 2019 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// cgo shouldn't crash if there is an extra argument with a C reference.
+
+package main
+
+// void F(void* p) {};
+import "C"
+
+import "unsafe"
+
+func F() {
+ var i int
+ C.F(unsafe.Pointer(&i), C.int(0)) // ERROR HERE
+}