Commit 10f3b090 authored by Ian Lance Taylor's avatar Ian Lance Taylor

cmd/cgo: don't strip qualifiers from C void* pointer

Now that we try to handle qualifiers correctly (as of CL 33325), don't
strip them from a void* pointer. Otherwise we break a case like "const
void**", as the "const" qualifier is dropped and the resulting
"void**" triggers a warning from the C compiler.

Fixes #18298.

Change-Id: If51df1889b0f6a907715298c152e6d4584747acb
Reviewed-on: https://go-review.googlesource.com/34370
Run-TryBot: Ian Lance Taylor <iant@golang.org>
Reviewed-by: default avatarBrad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
parent 4284edb9
...@@ -23,6 +23,18 @@ int I17537(S17537 *p); ...@@ -23,6 +23,18 @@ int I17537(S17537 *p);
const int F17537(const char **p) { const int F17537(const char **p) {
return **p; return **p;
} }
// Calling this function used to trigger an error from the C compiler
// (issue 18298).
void F18298(const void *const *p) {
}
// Test that conversions between typedefs work as they used to.
typedef const void *T18298_1;
struct S18298 { int i; };
typedef const struct S18298 *T18298_2;
void G18298(T18298_1 t) {
}
*/ */
import "C" import "C"
...@@ -39,4 +51,8 @@ func test17537(t *testing.T) { ...@@ -39,4 +51,8 @@ func test17537(t *testing.T) {
if got, want := C.F17537(&p), C.int(17); got != want { if got, want := C.F17537(&p), C.int(17); got != want {
t.Errorf("got %d, want %d", got, want) t.Errorf("got %d, want %d", got, want)
} }
C.F18298(nil)
var v18298 C.T18298_2
C.G18298(C.T18298_1(v18298))
} }
...@@ -1729,6 +1729,15 @@ func (c *typeConv) Type(dtype dwarf.Type, pos token.Pos) *Type { ...@@ -1729,6 +1729,15 @@ func (c *typeConv) Type(dtype dwarf.Type, pos token.Pos) *Type {
if _, ok := base(dt.Type).(*dwarf.VoidType); ok { if _, ok := base(dt.Type).(*dwarf.VoidType); ok {
t.Go = c.goVoidPtr t.Go = c.goVoidPtr
t.C.Set("void*") t.C.Set("void*")
dq := dt.Type
for {
if d, ok := dq.(*dwarf.QualType); ok {
t.C.Set(d.Qual + " " + t.C.String())
dq = d.Type
} else {
break
}
}
break break
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment