[release-branch.go1.11] cmd/cgo: preserve type information across loadDWARF loop

CL 122575 and its successors introduced a loop calling loadDWARF,
whereas before we only called it once. Pass a single typeConv to each
call, rather than creating a new one in loadDWARF itself. Change the
maps from dwarf.Type to use string keys rather than dwarf.Type keys,
since when the DWARF is reloaded the dwarf.Type pointers will be
different. These changes permit typeConv.Type to return a consistent
value for a given DWARF type, avoiding spurious type conversion errors
due to typedefs loaded after the first loop iteration.

Updates #27340
Fixes #27395

Change-Id: Ic33467bbfca4c54e95909621b35ba2a58216d96e
Reviewed-on: https://go-review.googlesource.com/c/152762
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Keith Randall <khr@golang.org>
(cherry picked from commit 6d4358705301e06e71b99977b77ae2c0a6b16b86)
Reviewed-on: https://go-review.googlesource.com/c/154277
Run-TryBot: Filippo Valsorda <filippo@golang.org>

diff --git a/misc/cgo/test/issue27340.go b/misc/cgo/test/issue27340.go
new file mode 100644 (file)
index 0000000..f8c8a87
--- /dev/null
+++ b/misc/cgo/test/issue27340.go
@@ -0,0 +1,12 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Failed to resolve typedefs consistently.
+// No runtime test; just make sure it compiles.
+
+package cgotest
+
+import "./issue27340"
+
+var issue27340Var = issue27340.Issue27340GoFunc

diff --git a/misc/cgo/test/issue27340/a.go b/misc/cgo/test/issue27340/a.go
new file mode 100644 (file)
index 0000000..f5b120c
--- /dev/null
+++ b/misc/cgo/test/issue27340/a.go
@@ -0,0 +1,42 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Failed to resolve typedefs consistently.
+// No runtime test; just make sure it compiles.
+// In separate directory to isolate #pragma GCC diagnostic.
+
+package issue27340
+
+// We use the #pragma to avoid a compiler warning about incompatible
+// pointer types, because we generate code passing a struct ptr rather
+// than using the typedef. This warning is expected and does not break
+// a normal build.
+// We can only disable -Wincompatible-pointer-types starting with GCC 5.
+
+// #if __GNU_MAJOR__ >= 5
+//
+// #pragma GCC diagnostic ignored "-Wincompatible-pointer-types"
+//
+// typedef struct {
+//     int a;
+// } issue27340Struct, *issue27340Ptr;
+//
+// static void issue27340CFunc(issue27340Ptr p) {}
+//
+// #else /* _GNU_MAJOR_ < 5 */
+//
+// typedef struct {
+//     int a;
+// } issue27340Struct;
+//
+// static issue27340Struct* issue27340Ptr(issue27340Struct* p) { return p; }
+//
+// static void issue27340CFunc(issue27340Struct *p) {}
+// #endif /* _GNU_MAJOR_ < 5 */
+import "C"
+
+func Issue27340GoFunc() {
+       var s C.issue27340Struct
+       C.issue27340CFunc(C.issue27340Ptr(&s))
+}

diff --git a/misc/cgo/test/issue9026/issue9026.go b/misc/cgo/test/issue9026/issue9026.go
index 0af86e64da487a44bc342f8c3bfd1aeea8d465fb..149c26562ad4d4fc56caede646d2ad8e2b9e83d6 100644 (file)
--- a/misc/cgo/test/issue9026/issue9026.go
+++ b/misc/cgo/test/issue9026/issue9026.go
@@ -29,7 +29,7 @@ func Test(t *testing.T) {
        // Brittle: the assertion may fail spuriously when the algorithm
        // changes, but should remain stable otherwise.
        got := fmt.Sprintf("%T %T", in, opts)
-       want := "issue9026._Ctype_struct___0 *issue9026._Ctype_struct___1"
+       want := "issue9026._Ctype_struct___0 *issue9026._Ctype_struct___0"
        if got != want {
                t.Errorf("Non-deterministic type names: got %s, want %s", got, want)
        }

diff --git a/src/cmd/cgo/gcc.go b/src/cmd/cgo/gcc.go
index 573ed4542cb77d154b169cdc47fc4bfbcdb8f3bb..588b7ed072174dcbe86b608ef89c3ac54a89bd15 100644 (file)
--- a/src/cmd/cgo/gcc.go
+++ b/src/cmd/cgo/gcc.go
@@ -163,6 +163,10 @@ func (p *Package) Translate(f *File) {
                // Convert C.ulong to C.unsigned long, etc.
                cref.Name.C = cname(cref.Name.Go)
        }
+
+       var conv typeConv
+       conv.Init(p.PtrSize, p.IntSize)
+
        p.loadDefines(f)
        p.typedefs = map[string]bool{}
        p.typedefList = nil
@@ -178,7 +182,7 @@ func (p *Package) Translate(f *File) {
                }
                needType := p.guessKinds(f)
                if len(needType) > 0 {
-                       p.loadDWARF(f, needType)
+                       p.loadDWARF(f, &conv, needType)
                }
 
                // In godefs mode we're OK with the typedefs, which
@@ -472,7 +476,7 @@ func (p *Package) guessKinds(f *File) []*Name {
 // loadDWARF parses the DWARF debug information generated
 // by gcc to learn the details of the constants, variables, and types
 // being referred to as C.xxx.
-func (p *Package) loadDWARF(f *File, names []*Name) {
+func (p *Package) loadDWARF(f *File, conv *typeConv, names []*Name) {
        // Extract the types from the DWARF section of an object
        // from a well-formed C program. Gcc only generates DWARF info
        // for symbols in the object file, so it is not enough to print the
@@ -579,8 +583,6 @@ func (p *Package) loadDWARF(f *File, names []*Name) {
        }
 
        // Record types and typedef information.
-       var conv typeConv
-       conv.Init(p.PtrSize, p.IntSize)
        for i, n := range names {
                if strings.HasSuffix(n.Go, "GetTypeID") && types[i].String() == "func() CFTypeID" {
                        conv.getTypeIDs[n.Go[:len(n.Go)-9]] = true
@@ -1734,10 +1736,10 @@ func runGcc(stdin []byte, args []string) (string, string) {
 // with equivalent memory layout.
 type typeConv struct {
        // Cache of already-translated or in-progress types.
-       m map[dwarf.Type]*Type
+       m map[string]*Type
 
        // Map from types to incomplete pointers to those types.
-       ptrs map[dwarf.Type][]*Type
+       ptrs map[string][]*Type
        // Keys of ptrs in insertion order (deterministic worklist)
        // ptrKeys contains exactly the keys in ptrs.
        ptrKeys []dwarf.Type
@@ -1772,8 +1774,8 @@ var unionWithPointer = make(map[ast.Expr]bool)
 func (c *typeConv) Init(ptrSize, intSize int64) {
        c.ptrSize = ptrSize
        c.intSize = intSize
-       c.m = make(map[dwarf.Type]*Type)
-       c.ptrs = make(map[dwarf.Type][]*Type)
+       c.m = make(map[string]*Type)
+       c.ptrs = make(map[string][]*Type)
        c.getTypeIDs = make(map[string]bool)
        c.bool = c.Ident("bool")
        c.byte = c.Ident("byte")
@@ -1881,11 +1883,12 @@ func (c *typeConv) FinishType(pos token.Pos) {
        // Keep looping until they're all done.
        for len(c.ptrKeys) > 0 {
                dtype := c.ptrKeys[0]
+               dtypeKey := dtype.String()
                c.ptrKeys = c.ptrKeys[1:]
-               ptrs := c.ptrs[dtype]
-               delete(c.ptrs, dtype)
+               ptrs := c.ptrs[dtypeKey]
+               delete(c.ptrs, dtypeKey)
 
-               // Note Type might invalidate c.ptrs[dtype].
+               // Note Type might invalidate c.ptrs[dtypeKey].
                t := c.Type(dtype, pos)
                for _, ptr := range ptrs {
                        ptr.Go.(*ast.StarExpr).X = t.Go
@@ -1897,7 +1900,8 @@ func (c *typeConv) FinishType(pos token.Pos) {
 // Type returns a *Type with the same memory layout as
 // dtype when used as the type of a variable or a struct field.
 func (c *typeConv) Type(dtype dwarf.Type, pos token.Pos) *Type {
-       if t, ok := c.m[dtype]; ok {
+       key := dtype.String()
+       if t, ok := c.m[key]; ok {
                if t.Go == nil {
                        fatalf("%s: type conversion loop at %s", lineno(pos), dtype)
                }
@@ -1908,7 +1912,7 @@ func (c *typeConv) Type(dtype dwarf.Type, pos token.Pos) *Type {
        t.Size = dtype.Size() // note: wrong for array of pointers, corrected below
        t.Align = -1
        t.C = &TypeRepr{Repr: dtype.Common().Name}
-       c.m[dtype] = t
+       c.m[key] = t
 
        switch dt := dtype.(type) {
        default:
@@ -2071,10 +2075,11 @@ func (c *typeConv) Type(dtype dwarf.Type, pos token.Pos) *Type {
                // Placeholder initialization; completed in FinishType.
                t.Go = &ast.StarExpr{}
                t.C.Set("<incomplete>*")
-               if _, ok := c.ptrs[dt.Type]; !ok {
+               key := dt.Type.String()
+               if _, ok := c.ptrs[key]; !ok {
                        c.ptrKeys = append(c.ptrKeys, dt.Type)
                }
-               c.ptrs[dt.Type] = append(c.ptrs[dt.Type], t)
+               c.ptrs[key] = append(c.ptrs[key], t)
 
        case *dwarf.QualType:
                t1 := c.Type(dt.Type, pos)