Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

cmd/go, cmd/cgo: support older versions of gccgo that lack cgo.Incomplete

Browse source 
Test whether gccgo/GoLLVM supports cgo.Incomplete. If it doesn't, use a
local definition rather than importing it.

Roll back 426496, which skipped a gccgo test, as it now works.

For #46731
Fixes #54761

Change-Id: I8bb2ad84c317094495405e178bf5c9694f82af56
Reviewed-on: https://go-review.googlesource.com/c/go/+/446260
Reviewed-by: Bryan Mills <bcmills@google.com>
Run-TryBot: Ian Lance Taylor <iant@google.com>
Auto-Submit: Ian Lance Taylor <iant@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Run-TryBot: Bryan Mills <bcmills@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
This commit is contained in:
Ian Lance Taylor 2022-10-28 12:13:37 -07:00 • committed by Gopher Robot
parent 91a1f0d918
commit 3c17053bba
7 changed files with 93 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/cmd/cgo/gcc.go
View file

@ -47,6 +47,8 @@ var nameToC = map[string]string{
"complexdouble": "double _Complex",
}
var incomplete = "_cgopackage.Incomplete"
// cname returns the C name to use for C.s.
// The expansions are listed in nameToC and also
// struct_foo becomes "struct foo", and similarly for
@ -2565,7 +2567,7 @@ func (c *typeConv) loadType(dtype dwarf.Type, pos token.Pos, parent string) *Typ
// get writebarrier-ed or adjusted during a stack copy. This should handle
// all the cases badPointerTypedef used to handle, but hopefully will
// continue to work going forward without any more need for cgo changes.
tt.Go = c.Ident("_cgopackage.Incomplete")
tt.Go = c.Ident(incomplete)
typedef[name.Name] = &tt
break
}
@ -2592,7 +2594,7 @@ func (c *typeConv) loadType(dtype dwarf.Type, pos token.Pos, parent string) *Typ
}
tt.Go = g
if c.incompleteStructs[tag] {
tt.Go = c.Ident("_cgopackage.Incomplete")
tt.Go = c.Ident(incomplete)
}
typedef[name.Name] = &tt
}
@ -2640,7 +2642,7 @@ func (c *typeConv) loadType(dtype dwarf.Type, pos token.Pos, parent string) *Typ
if c.badVoidPointerTypedef(dt) {
// Treat this typedef as a pointer to a _cgopackage.Incomplete.
s := *sub
s.Go = c.Ident("*_cgopackage.Incomplete")
s.Go = c.Ident("*" + incomplete)
sub = &s
// Make sure we update any previously computed type.
if oldType := typedef[name.Name]; oldType != nil {
@ -2656,7 +2658,7 @@ func (c *typeConv) loadType(dtype dwarf.Type, pos token.Pos, parent string) *Typ
// Make sure we update any previously computed type.
name := "_Ctype_struct_" + strct.StructName
if oldType := typedef[name]; oldType != nil {
oldType.Go = c.Ident("_cgopackage.Incomplete")
oldType.Go = c.Ident(incomplete)
}
}
}
@ -3196,7 +3198,7 @@ func (c *typeConv) anonymousStructTypedef(dt *dwarf.TypedefType) bool {
// non-pointers in this type.
// TODO: Currently our best solution is to find these manually and list them as
// they come up. A better solution is desired.
// Note: DEPRECATED. There is now a better solution. Search for _cgopackage.Incomplete in this file.
// Note: DEPRECATED. There is now a better solution. Search for incomplete in this file.
func (c *typeConv) badPointerTypedef(dt *dwarf.TypedefType) bool {
if c.badCFType(dt) {
return true