Commit 933d7129 authored by Russ Cox's avatar Russ Cox

cmd/gc: squelch spurious "invalid recursive type" error

R=ken2
CC=golang-dev
https://golang.org/cl/13512047
parent 903c2fda
...@@ -119,7 +119,8 @@ dowidth(Type *t) ...@@ -119,7 +119,8 @@ dowidth(Type *t)
if(t->width == -2) { if(t->width == -2) {
lno = lineno; lno = lineno;
lineno = t->lineno; lineno = t->lineno;
yyerror("invalid recursive type %T", t); if(!t->broke)
yyerror("invalid recursive type %T", t);
t->width = 0; t->width = 0;
lineno = lno; lineno = lno;
return; return;
...@@ -219,7 +220,8 @@ dowidth(Type *t) ...@@ -219,7 +220,8 @@ dowidth(Type *t)
checkwidth(t->down); checkwidth(t->down);
break; break;
case TFORW: // should have been filled in case TFORW: // should have been filled in
yyerror("invalid recursive type %T", t); if(!t->broke)
yyerror("invalid recursive type %T", t);
w = 1; // anything will do w = 1; // anything will do
break; break;
case TANY: case TANY:
......
...@@ -3046,7 +3046,7 @@ queuemethod(Node *n) ...@@ -3046,7 +3046,7 @@ queuemethod(Node *n)
Node* Node*
typecheckdef(Node *n) typecheckdef(Node *n)
{ {
int lno; int lno, nerrors0;
Node *e; Node *e;
Type *t; Type *t;
NodeList *l; NodeList *l;
...@@ -3174,7 +3174,13 @@ typecheckdef(Node *n) ...@@ -3174,7 +3174,13 @@ typecheckdef(Node *n)
n->walkdef = 1; n->walkdef = 1;
n->type = typ(TFORW); n->type = typ(TFORW);
n->type->sym = n->sym; n->type->sym = n->sym;
nerrors0 = nerrors;
typecheckdeftype(n); typecheckdeftype(n);
if(n->type->etype == TFORW && nerrors > nerrors0) {
// Something went wrong during type-checking,
// but it was reported. Silence future errors.
n->type->broke = 1;
}
if(curfn) if(curfn)
resumecheckwidth(); resumecheckwidth();
break; break;
......
// errorcheck
// Used to emit a spurious "invalid recursive type" error.
// See golang.org/issue/5581.
// Copyright 2013 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.
package main
import "fmt"
func NewBar() *Bar { return nil }
func (x *Foo) Method() (int, error) {
for y := range x.m {
_ = y.A
}
return 0, nil
}
type Foo struct {
m map[*Bar]int
}
type Bar struct {
A *Foo
B chan Blah // ERROR "undefined: Blah"
}
func main() {
fmt.Println("Hello, playground")
}
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