diff options
| author | Shenghou Ma <minux@golang.org> | 2014-12-23 17:14:04 -0500 |
|---|---|---|
| committer | Andrew Gerrand <adg@golang.org> | 2015-02-17 23:36:26 +0000 |
| commit | 02cf0526bf76e5990ae3c2a9942866320de0bde3 (patch) | |
| tree | ada1d76233a0c4910ff3e8d512bb67eb7e724593 | |
| parent | 3124622303cd50e9b5965ea4dd68ef294e1a4404 (diff) | |
| download | go-02cf0526bf76e5990ae3c2a9942866320de0bde3.tar.gz go-02cf0526bf76e5990ae3c2a9942866320de0bde3.zip | |
[release-branch.go1.4] cmd/gc: don't recurse infinitely when a recursive type references itself more than once
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>
| -rw-r--r-- | src/cmd/gc/align.c | 5 | ||||
| -rw-r--r-- | test/fixedbugs/issue9432.go | 15 |
2 files changed, 20 insertions, 0 deletions
diff --git a/src/cmd/gc/align.c b/src/cmd/gc/align.c index 6e5d149c75..63ed2e5af6 100644 --- 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 index 0000000000..0d0bc960f9 --- /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" |