Commit 4b6ca212 authored by Rémy Oudompheng's avatar Rémy Oudompheng

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
parent b34f0551
...@@ -548,6 +548,12 @@ algtype1(Type *t, Type **bad) ...@@ -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* ...@@ -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:
......
// 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
}
// 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() {
}
// 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
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