[release-branch.go1.4] cmd/gc: don't recurse infinitely when a recursive type referen...

Fixes #9432

Change-Id: I08c92481afa7c7fac890aa780efc1cb2fabad528
Reviewed-on: https://go-review.googlesource.com/2115
Reviewed-by: Josh Bleecher Snyder <josharian@gmail.com>
Reviewed-by: Russ Cox <rsc@golang.org>
(cherry picked from commit fcff3ba740ed6638cece4dea8478bd1dfb2411bf)
Reviewed-on: https://go-review.googlesource.com/5004
Run-TryBot: Andrew Gerrand <adg@golang.org>
Reviewed-by: Andrew Gerrand <adg@golang.org>

diff --git a/src/cmd/gc/align.c b/src/cmd/gc/align.c
index 6e5d149c750829b675f2262cbb375b43835bcfb5..63ed2e5af66986ac9c7aef18f52cc575ea35e46c 100644 (file)
--- a/src/cmd/gc/align.c
+++ b/src/cmd/gc/align.c
@@ -128,6 +128,11 @@ dowidth(Type *t)
                return;
        }
 
+       // break infinite recursion if the broken recursive type
+       // is referenced again
+       if(t->broke && t->width == 0)
+               return;
+
        // defer checkwidth calls until after we're done
        defercalc++;
 

diff --git a/test/fixedbugs/issue9432.go b/test/fixedbugs/issue9432.go
new file mode 100644 (file)
index 0000000..0d0bc96
--- /dev/null
+++ b/test/fixedbugs/issue9432.go
@@ -0,0 +1,15 @@
+// errorcheck
+
+// Copyright 2014 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.
+
+// gc used to recurse infinitely when dowidth is applied
+// to a broken recursive type again.
+// See golang.org/issue/9432.
+package p
+
+type foo struct { // GCCGO_ERROR "invalid recursive type"
+       bar  foo
+       blah foo
+} // ERROR "invalid recursive type foo"