mirror of
https://github.com/golang/go.git
synced 2025-12-08 06:10:04 +00:00
cmd/cgo: use same Go type for typedef to anonymous struct
If we see a typedef to an anonymous struct more than once, presumably in two different Go files that import "C", use the same Go type name. Fixes #8133. LGTM=rsc R=rsc CC=golang-codereviews https://golang.org/cl/102080043
This commit is contained in:
parent
06b67f304e
commit
4e65f18cae
4 changed files with 46 additions and 1 deletions
|
|
@ -1269,7 +1269,8 @@ func (c *typeConv) Type(dtype dwarf.Type, pos token.Pos) *Type {
|
|||
sub := c.Type(dt.Type, pos)
|
||||
t.Size = sub.Size
|
||||
t.Align = sub.Align
|
||||
if _, ok := typedef[name.Name]; !ok {
|
||||
oldType := typedef[name.Name]
|
||||
if oldType == nil {
|
||||
tt := *t
|
||||
tt.Go = sub.Go
|
||||
typedef[name.Name] = &tt
|
||||
|
|
@ -1281,6 +1282,15 @@ func (c *typeConv) Type(dtype dwarf.Type, pos token.Pos) *Type {
|
|||
// In -godefs and -cdefs mode, do this for all typedefs.
|
||||
if isStructUnionClass(sub.Go) || *godefs || *cdefs {
|
||||
t.Go = sub.Go
|
||||
|
||||
// If we've seen this typedef before, and it
|
||||
// was an anonymous struct/union/class before
|
||||
// too, use the old definition.
|
||||
// TODO: it would be safer to only do this if
|
||||
// we verify that the types are the same.
|
||||
if oldType != nil && isStructUnionClass(oldType.Go) {
|
||||
t.Go = oldType.Go
|
||||
}
|
||||
}
|
||||
|
||||
case *dwarf.UcharType:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue