diff --git a/src/cmd/compile/internal/importer/ureader.go b/src/cmd/compile/internal/importer/ureader.go index 467b1d418f41c9..5f14eb695e44dd 100644 --- a/src/cmd/compile/internal/importer/ureader.go +++ b/src/cmd/compile/internal/importer/ureader.go @@ -417,7 +417,10 @@ func (pr *pkgReader) objIdx(idx pkgbits.Index) (*types2.Package, string) { case pkgbits.ObjAlias: pos := r.pos() - var tparams []*types2.TypeParam // TODO(#68778): Read tparams for unified IR. + var tparams []*types2.TypeParam + if r.Version().Has(pkgbits.AliasTypeParamNames) { + tparams = r.typeParamNames() + } typ := r.typ() return newAliasTypeName(pr.enableAlias, pos, objPkg, objName, typ, tparams) diff --git a/src/cmd/compile/internal/noder/reader.go b/src/cmd/compile/internal/noder/reader.go index a825d60f7eb813..33fb7d35e1c0fa 100644 --- a/src/cmd/compile/internal/noder/reader.go +++ b/src/cmd/compile/internal/noder/reader.go @@ -746,6 +746,10 @@ func (pr *pkgReader) objIdxMayFail(idx index, implicits, explicits []*types.Type case pkgbits.ObjAlias: name := do(ir.OTYPE, false) + if r.Version().Has(pkgbits.AliasTypeParamNames) { + r.typeParamNames() + } + // Clumsy dance: the r.typ() call here might recursively find this // type alias name, before we've set its type (#66873). So we // temporarily clear sym.Def and then restore it later, if still diff --git a/src/cmd/compile/internal/noder/writer.go b/src/cmd/compile/internal/noder/writer.go index c3ca40879062d0..ecc03cbd838f24 100644 --- a/src/cmd/compile/internal/noder/writer.go +++ b/src/cmd/compile/internal/noder/writer.go @@ -855,11 +855,19 @@ func (w *writer) doObj(wext *writer, obj types2.Object) pkgbits.CodeObj { case *types2.TypeName: if obj.IsAlias() { w.pos(obj) - t := obj.Type() - if alias, ok := t.(*types2.Alias); ok { // materialized alias - t = alias.Rhs() + rhs := obj.Type() + var tparams *types2.TypeParamList + if alias, ok := rhs.(*types2.Alias); ok { // materialized alias + assert(alias.TypeArgs() == nil) + tparams = alias.TypeParams() + rhs = alias.Rhs() } - w.typ(t) + if w.Version().Has(pkgbits.AliasTypeParamNames) { + w.typeParamNames(tparams) + } + // TODO(taking): enable this assertion once this is not intended to be a nop. + // assert(w.Version().Has(pkgbits.AliasTypeParamNames) || tparams.Len() == 0) + w.typ(rhs) return pkgbits.ObjAlias } diff --git a/src/go/internal/gcimporter/ureader.go b/src/go/internal/gcimporter/ureader.go index e4b4e17749903a..b763ff5cca3686 100644 --- a/src/go/internal/gcimporter/ureader.go +++ b/src/go/internal/gcimporter/ureader.go @@ -488,7 +488,10 @@ func (pr *pkgReader) objIdx(idx pkgbits.Index) (*types.Package, string) { case pkgbits.ObjAlias: pos := r.pos() - var tparams []*types.TypeParam // TODO(#68778): Read tparams for unified IR. + var tparams []*types.TypeParam + if r.Version().Has(pkgbits.AliasTypeParamNames) { + tparams = r.typeParamNames() + } typ := r.typ() declare(newAliasTypeName(pos, objPkg, objName, typ, tparams))