diff options
| author | Shenghou Ma <minux@golang.org> | 2014-12-23 17:14:04 -0500 |
|---|---|---|
| committer | Minux Ma <minux@golang.org> | 2015-01-12 02:09:50 +0000 |
| commit | fcff3ba740ed6638cece4dea8478bd1dfb2411bf (patch) | |
| tree | 22f7b1727ef4893de3e35348cc0d1d030c6f2a08 | |
| parent | 301ad790a2eef1962a97f9ccef5de8eff84c12fb (diff) | |
| download | go-fcff3ba740ed6638cece4dea8478bd1dfb2411bf.tar.xz | |
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>
| -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 29accd3538..57daaa9745 100644 --- a/src/cmd/gc/align.c +++ b/src/cmd/gc/align.c @@ -137,6 +137,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" |