mirror of
https://github.com/golang/go
synced 2024-10-14 03:43:28 +00:00
cmd/gc: be more tolerant with recursive types when checking map types.
A nested TFORW type would push algtype1 into an impossible case. Fixes #5125. R=golang-dev, daniel.morsing CC=golang-dev https://golang.org/cl/8213043
This commit is contained in:
parent
b34f055138
commit
4b6ca21271
|
@ -548,6 +548,12 @@ algtype1(Type *t, Type **bad)
|
||||||
*bad = T;
|
*bad = T;
|
||||||
|
|
||||||
switch(t->etype) {
|
switch(t->etype) {
|
||||||
|
case TANY:
|
||||||
|
case TFORW:
|
||||||
|
// will be defined later.
|
||||||
|
*bad = t;
|
||||||
|
return -1;
|
||||||
|
|
||||||
case TINT8:
|
case TINT8:
|
||||||
case TUINT8:
|
case TUINT8:
|
||||||
case TINT16:
|
case TINT16:
|
||||||
|
@ -665,11 +671,14 @@ Type*
|
||||||
maptype(Type *key, Type *val)
|
maptype(Type *key, Type *val)
|
||||||
{
|
{
|
||||||
Type *t;
|
Type *t;
|
||||||
|
Type *bad;
|
||||||
|
int atype;
|
||||||
|
|
||||||
if(key != nil) {
|
if(key != nil) {
|
||||||
switch(key->etype) {
|
atype = algtype1(key, &bad);
|
||||||
|
switch(bad == T ? key->etype : bad->etype) {
|
||||||
default:
|
default:
|
||||||
if(algtype1(key, nil) == ANOEQ)
|
if(atype == ANOEQ)
|
||||||
yyerror("invalid map key type %T", key);
|
yyerror("invalid map key type %T", key);
|
||||||
break;
|
break;
|
||||||
case TANY:
|
case TANY:
|
||||||
|
|
17
test/fixedbugs/issue5125.dir/bug.go
Normal file
17
test/fixedbugs/issue5125.dir/bug.go
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
// 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 bug
|
||||||
|
|
||||||
|
type Node interface {
|
||||||
|
Eval(s *Scene)
|
||||||
|
}
|
||||||
|
|
||||||
|
type plug struct {
|
||||||
|
node Node
|
||||||
|
}
|
||||||
|
|
||||||
|
type Scene struct {
|
||||||
|
changed map[plug]bool
|
||||||
|
}
|
10
test/fixedbugs/issue5125.dir/main.go
Normal file
10
test/fixedbugs/issue5125.dir/main.go
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
// 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 _ "./bug"
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
}
|
10
test/fixedbugs/issue5125.go
Normal file
10
test/fixedbugs/issue5125.go
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
// compiledir
|
||||||
|
|
||||||
|
// 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.
|
||||||
|
|
||||||
|
// Issue 5125: cyclic dependencies between types confuse
|
||||||
|
// the hashability test during import.
|
||||||
|
|
||||||
|
package ignored
|
Loading…
Reference in a new issue