diff options
Diffstat (limited to 'src/cmd/compile/internal')
| -rw-r--r-- | src/cmd/compile/internal/noder/writer.go | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/cmd/compile/internal/noder/writer.go b/src/cmd/compile/internal/noder/writer.go index 9b33fb7c6d..fe8f8f2a35 100644 --- a/src/cmd/compile/internal/noder/writer.go +++ b/src/cmd/compile/internal/noder/writer.go @@ -543,7 +543,7 @@ func (pw *pkgWriter) typIdx(typ types2.Type, dict *writerDict) typeInfo { case *types2.Alias: w.Code(pkgbits.TypeNamed) - w.namedType(typ.Obj(), nil) + w.namedType(splitAlias(typ)) case *types2.TypeParam: w.derived = true @@ -2958,6 +2958,9 @@ func objTypeParams(obj types2.Object) *types2.TypeParamList { if !obj.IsAlias() { return obj.Type().(*types2.Named).TypeParams() } + if alias, ok := obj.Type().(*types2.Alias); ok { + return alias.TypeParams() + } } return nil } @@ -2974,6 +2977,14 @@ func splitNamed(typ *types2.Named) (*types2.TypeName, *types2.TypeList) { return typ.Obj(), typ.TypeArgs() } +// splitAlias is like splitNamed, but for an alias type. +func splitAlias(typ *types2.Alias) (*types2.TypeName, *types2.TypeList) { + orig := typ.Origin() + base.Assertf(typ.Obj() == orig.Obj(), "alias type %v has object %v, but %v has object %v", typ, typ.Obj(), orig, orig.Obj()) + + return typ.Obj(), typ.TypeArgs() +} + func asPragmaFlag(p syntax.Pragma) ir.PragmaFlag { if p == nil { return 0 |