Commit 01e072db authored by Ian Lance Taylor's avatar Ian Lance Taylor

cmd/cgo: don't cache bad pointer typedefs

The set of bad pointer typedefs changes as we see more typedefs, so
avoid looking in the cache when we find one.

Fixes #29175

Change-Id: Idd82289bdd8628d11a983fa5ec96517e3a5bcbf1
Reviewed-on: https://go-review.googlesource.com/c/153597
Run-TryBot: Ian Lance Taylor <iant@golang.org>
Reviewed-by: default avatarKeith Randall <khr@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
parent f6a16317
...@@ -2177,13 +2177,23 @@ func (c *typeConv) FinishType(pos token.Pos) { ...@@ -2177,13 +2177,23 @@ func (c *typeConv) FinishType(pos token.Pos) {
// Type returns a *Type with the same memory layout as // Type returns a *Type with the same memory layout as
// dtype when used as the type of a variable or a struct field. // dtype when used as the type of a variable or a struct field.
func (c *typeConv) Type(dtype dwarf.Type, pos token.Pos) *Type { func (c *typeConv) Type(dtype dwarf.Type, pos token.Pos) *Type {
// Always recompute bad pointer typedefs, as the set of such
// typedefs changes as we see more types.
checkCache := true
if dtt, ok := dtype.(*dwarf.TypedefType); ok && c.badPointerTypedef(dtt) {
checkCache = false
}
key := dtype.String() key := dtype.String()
if checkCache {
if t, ok := c.m[key]; ok { if t, ok := c.m[key]; ok {
if t.Go == nil { if t.Go == nil {
fatalf("%s: type conversion loop at %s", lineno(pos), dtype) fatalf("%s: type conversion loop at %s", lineno(pos), dtype)
} }
return t return t
} }
}
t := new(Type) t := new(Type)
t.Size = dtype.Size() // note: wrong for array of pointers, corrected below t.Size = dtype.Size() // note: wrong for array of pointers, corrected below
......
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