admin/llgo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ssa: func Instantiate

Browse Source
This commit is contained in:
visualfc
2024-10-30 21:02:08 +08:00
parent ce87f293aa
commit 38091b2021
3 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cl/builtin_test.go
View File

@@ -345,3 +345,20 @@ func TestContextResolveLinkname(t *testing.T) {
})
}
}
func TestInstantiate(t *testing.T) {
obj := types.NewTypeName(0, nil, "T", nil)
named := types.NewNamed(obj, types.Typ[types.Int], nil)
if typ := obj.Type(); typ != instantiate(typ, named) {
t.Fatal("error")
}
tparam := types.NewTypeParam(types.NewTypeName(0, nil, "P", nil), types.NewInterface(nil, nil))
named.SetTypeParams([]*types.TypeParam{tparam})
inamed, err := types.Instantiate(nil, named, []types.Type{types.Typ[types.Int]}, true)
if err != nil {
t.Fatal(err)
}
if typ := instantiate(obj.Type(), inamed.(*types.Named)); typ == obj.Type() || typ.(*types.Named).TypeArgs() == nil {
t.Fatal("error")
}
}

19
cl/compile.go
View File

@@ -1036,19 +1036,7 @@ func (p *context) patchType(typ types.Type) types.Type {
if pkg := o.Pkg(); typepatch.IsPatched(pkg) {
if patch, ok := p.patches[pkg.Path()]; ok {
if obj := patch.Types.Scope().Lookup(o.Name()); obj != nil {
otyp := obj.Type()
if tp := t.TypeArgs(); tp != nil {
targs := make([]types.Type, tp.Len())
for i := 0; i < tp.Len(); i++ {
targs[i] = tp.At(i)
}
var err error
otyp, err = types.Instantiate(nil, obj.Type(), targs, true)
if err != nil {
panic(fmt.Errorf("patchType error: %v", err))
}
}
return p.prog.Type(otyp, llssa.InGo).RawType()
return p.prog.Type(instantiate(obj.Type(), t), llssa.InGo).RawType()
}
}
}
@@ -1056,6 +1044,11 @@ func (p *context) patchType(typ types.Type) types.Type {
return typ
}
func instantiate(orig types.Type, t *types.Named) (typ types.Type) {
typ, _ = llssa.Instantiate(orig, t)
return
}
func (p *context) resolveLinkname(name string) string {
if link, ok := p.prog.Linkname(name); ok {
prefix, ltarget, _ := strings.Cut(link, ".")

23
ssa/type_cvt.go
View File

@@ -148,15 +148,7 @@ func (p goTypes) cvtNamed(t *types.Named) (raw *types.Named, cvt bool) {
p.typs[unsafe.Pointer(t)] = unsafe.Pointer(t)
if tund, cvt := p.cvtType(t.Underlying()); cvt {
named.SetUnderlying(tund)
if tp := t.TypeArgs(); tp != nil {
targs := make([]types.Type, tp.Len())
for i := 0; i < tp.Len(); i++ {
targs[i] = tp.At(i)
}
typ, err := types.Instantiate(nil, named, targs, true)
if err != nil {
panic(fmt.Errorf("cvtNamed error: %v", err))
}
if typ, ok := Instantiate(named, t); ok {
named = typ.(*types.Named)
}
p.typs[unsafe.Pointer(t)] = unsafe.Pointer(named)
@@ -165,6 +157,19 @@ func (p goTypes) cvtNamed(t *types.Named) (raw *types.Named, cvt bool) {
return t, false
}
func Instantiate(orig types.Type, t *types.Named) (types.Type, bool) {
if tp := t.TypeArgs(); tp != nil {
targs := make([]types.Type, tp.Len())
for i := 0; i < tp.Len(); i++ {
targs[i] = tp.At(i)
}
if typ, err := types.Instantiate(nil, orig, targs, true); err == nil {
return typ, true
}
}
return orig, false
}
func (p goTypes) cvtClosure(sig *types.Signature) *types.Struct {
ctx := types.NewParam(token.NoPos, nil, closureCtx, types.Typ[types.UnsafePointer])
raw := p.cvtFunc(sig, ctx)