aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/cmd/compile/internal/noder/stencil.go24
-rw-r--r--src/cmd/compile/internal/reflectdata/reflect.go6
2 files changed, 29 insertions, 1 deletions
diff --git a/src/cmd/compile/internal/noder/stencil.go b/src/cmd/compile/internal/noder/stencil.go
index 461083d171..85538f590d 100644
--- a/src/cmd/compile/internal/noder/stencil.go
+++ b/src/cmd/compile/internal/noder/stencil.go
@@ -994,6 +994,26 @@ func (g *irgen) genericSubst(newsym *types.Sym, nameNode *ir.Name, shapes, targs
g.instTypeList = append(g.instTypeList, subst.unshapify.InstTypeList...)
g.instTypeList = append(g.instTypeList, subst.concretify.InstTypeList...)
+ if doubleCheck {
+ okConvs := map[ir.Node]bool{}
+ ir.Visit(newf, func(n ir.Node) {
+ if n.Op() == ir.OIDATA {
+ // IDATA(OCONVIFACE(x)) is ok, as we don't use the type of x.
+ // TODO: use some other op besides OCONVIFACE. ONEW might work
+ // (with appropriate direct vs. indirect interface cases).
+ okConvs[n.(*ir.UnaryExpr).X] = true
+ }
+ if n.Op() == ir.OCONVIFACE && !okConvs[n] {
+ c := n.(*ir.ConvExpr)
+ if c.X.Type().HasShape() {
+ ir.Dump("BAD FUNCTION", newf)
+ ir.Dump("BAD CONVERSION", c)
+ base.Fatalf("converting shape type to interface")
+ }
+ }
+ })
+ }
+
return newf
}
@@ -1367,6 +1387,8 @@ func (subst *subster) node(n ir.Node) ir.Node {
if x.X.Type().HasTParam() {
m = subst.convertUsingDictionary(m.Pos(), m.(*ir.ConvExpr).X, x, m.Type(), x.X.Type())
}
+ case ir.ODOTTYPE, ir.ODOTTYPE2:
+ m.SetType(subst.unshapifyTyp(m.Type()))
case ir.ONEW:
// New needs to pass a concrete type to the runtime.
@@ -1535,7 +1557,7 @@ func (g *irgen) getDictionarySym(gf *ir.Name, targs []*types.Type, isMeth bool)
// Enforce that only concrete types can make it to here.
for _, t := range targs {
- if t.IsShape() {
+ if t.HasShape() {
panic(fmt.Sprintf("shape %+v in dictionary for %s", t, gf.Sym().Name))
}
}
diff --git a/src/cmd/compile/internal/reflectdata/reflect.go b/src/cmd/compile/internal/reflectdata/reflect.go
index 1391102d0f..875d53b3cc 100644
--- a/src/cmd/compile/internal/reflectdata/reflect.go
+++ b/src/cmd/compile/internal/reflectdata/reflect.go
@@ -1982,6 +1982,12 @@ var ZeroSize int64
// MarkTypeUsedInInterface marks that type t is converted to an interface.
// This information is used in the linker in dead method elimination.
func MarkTypeUsedInInterface(t *types.Type, from *obj.LSym) {
+ if t.HasShape() {
+ // TODO: shape types shouldn't be put in interfaces, so we shouldn't ever get here.
+ // We don't from ../noder/stencil.go, but we do from ../walk/walk.go when we let
+ // shape types become the types of interfaces.
+ //base.Fatalf("shape types have no methods %+v", t)
+ }
tsym := TypeLinksym(t)
// Emit a marker relocation. The linker will know the type is converted
// to an interface if "from" is reachable.