qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-23 03:50:03 -07:00
Code Releases Activity

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

Browse Source 
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: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Ian Lance Taylor 2016-12-13 14:29:57 -08:00
parent 4284edb999
commit 10f3b09027
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
misc/cgo/test/issue17537.go
View File

@ -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) {
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))
} }

9
src/cmd/cgo/gcc.go
View File

@ -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
} }