diff --git a/cl/_testgo/strucintf/out.ll b/cl/_testgo/strucintf/out.ll index de0f7f58..2bfabedd 100644 --- a/cl/_testgo/strucintf/out.ll +++ b/cl/_testgo/strucintf/out.ll @@ -3,14 +3,24 @@ source_filename = "main" %"github.com/goplus/llgo/internal/runtime.eface" = type { ptr, ptr } %"github.com/goplus/llgo/internal/runtime.String" = type { ptr, i64 } +%"github.com/goplus/llgo/internal/abi.StructField" = type { %"github.com/goplus/llgo/internal/abi.Name", ptr, i64 } +%"github.com/goplus/llgo/internal/abi.Name" = type { ptr } +%"github.com/goplus/llgo/internal/runtime.Slice" = type { ptr, i64, i64 } @"main.init$guard" = global ptr null @__llgo_argc = global ptr null @__llgo_argv = global ptr null -@"_llgo_struct$K-dZ9QotZfVPz2a0YdRa9vmZUuDXPTqZOlMShKEDJtk" = global ptr null -@"main.struct$MYpsoM99ZwFY087IpUOkIw1zjBA_sgFXVodmn1m-G88" = global ptr null +@"_llgo_struct$K-dZ9QotZfVPz2a0YdRa9vmZUuDXPTqZOlMShKEDJtk" = linkonce global ptr null +@"main.struct$MYpsoM99ZwFY087IpUOkIw1zjBA_sgFXVodmn1m-G88" = linkonce global ptr null @0 = private unnamed_addr constant [12 x i8] c"Bar: not ok\00", align 1 @1 = private unnamed_addr constant [10 x i8] c"F: not ok\00", align 1 +@2 = private unnamed_addr constant [2 x i8] c"V\00", align 1 +@_llgo_int = external global ptr +@3 = private unnamed_addr constant [1 x i8] zeroinitializer, align 1 +@4 = private unnamed_addr constant [5 x i8] c"main\00", align 1 +@5 = private unnamed_addr constant [2 x i8] c"v\00", align 1 +@6 = private unnamed_addr constant [1 x i8] zeroinitializer, align 1 +@7 = private unnamed_addr constant [5 x i8] c"main\00", align 1 define void @main.init() { _llgo_0: @@ -131,6 +141,72 @@ _llgo_6: ; preds = %_llgo_2 call void @"github.com/goplus/llgo/internal/runtime.PrintString"(%"github.com/goplus/llgo/internal/runtime.String" %57) call void @"github.com/goplus/llgo/internal/runtime.PrintByte"(i8 10) br label %_llgo_5 + %58 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 + %59 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %58, i32 0, i32 0 + store ptr @2, ptr %59, align 8 + %60 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %58, i32 0, i32 1 + store i64 1, ptr %60, align 4 + %61 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %58, align 8 + %62 = load ptr, ptr @_llgo_int, align 8 + %63 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 + %64 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %63, i32 0, i32 0 + store ptr @3, ptr %64, align 8 + %65 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %63, i32 0, i32 1 + store i64 0, ptr %65, align 4 + %66 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %63, align 8 + %67 = call %"github.com/goplus/llgo/internal/abi.StructField" @"github.com/goplus/llgo/internal/runtime.StructField"(%"github.com/goplus/llgo/internal/runtime.String" %61, ptr %62, i64 0, %"github.com/goplus/llgo/internal/runtime.String" %66, i1 true, i1 false) + %68 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 + %69 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %68, i32 0, i32 0 + store ptr @4, ptr %69, align 8 + %70 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %68, i32 0, i32 1 + store i64 4, ptr %70, align 4 + %71 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %68, align 8 + %72 = call ptr @"github.com/goplus/llgo/internal/runtime.AllocU"(i64 24) + %73 = getelementptr %"github.com/goplus/llgo/internal/abi.StructField", ptr %72, i64 0 + store %"github.com/goplus/llgo/internal/abi.StructField" %67, ptr %73, align 8 + %74 = alloca %"github.com/goplus/llgo/internal/runtime.Slice", align 8 + %75 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %74, i32 0, i32 0 + store ptr %72, ptr %75, align 8 + %76 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %74, i32 0, i32 1 + store i64 1, ptr %76, align 4 + %77 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %74, i32 0, i32 2 + store i64 1, ptr %77, align 4 + %78 = load %"github.com/goplus/llgo/internal/runtime.Slice", ptr %74, align 8 + %79 = call ptr @"github.com/goplus/llgo/internal/runtime.Struct"(%"github.com/goplus/llgo/internal/runtime.String" %71, %"github.com/goplus/llgo/internal/runtime.Slice" %78) + store ptr %79, ptr @"_llgo_struct$K-dZ9QotZfVPz2a0YdRa9vmZUuDXPTqZOlMShKEDJtk", align 8 + %80 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 + %81 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %80, i32 0, i32 0 + store ptr @5, ptr %81, align 8 + %82 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %80, i32 0, i32 1 + store i64 1, ptr %82, align 4 + %83 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %80, align 8 + %84 = load ptr, ptr @_llgo_int, align 8 + %85 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 + %86 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %85, i32 0, i32 0 + store ptr @6, ptr %86, align 8 + %87 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %85, i32 0, i32 1 + store i64 0, ptr %87, align 4 + %88 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %85, align 8 + %89 = call %"github.com/goplus/llgo/internal/abi.StructField" @"github.com/goplus/llgo/internal/runtime.StructField"(%"github.com/goplus/llgo/internal/runtime.String" %83, ptr %84, i64 0, %"github.com/goplus/llgo/internal/runtime.String" %88, i1 false, i1 false) + %90 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 + %91 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %90, i32 0, i32 0 + store ptr @7, ptr %91, align 8 + %92 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %90, i32 0, i32 1 + store i64 4, ptr %92, align 4 + %93 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %90, align 8 + %94 = call ptr @"github.com/goplus/llgo/internal/runtime.AllocU"(i64 24) + %95 = getelementptr %"github.com/goplus/llgo/internal/abi.StructField", ptr %94, i64 0 + store %"github.com/goplus/llgo/internal/abi.StructField" %89, ptr %95, align 8 + %96 = alloca %"github.com/goplus/llgo/internal/runtime.Slice", align 8 + %97 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %96, i32 0, i32 0 + store ptr %94, ptr %97, align 8 + %98 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %96, i32 0, i32 1 + store i64 1, ptr %98, align 4 + %99 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %96, i32 0, i32 2 + store i64 1, ptr %99, align 4 + %100 = load %"github.com/goplus/llgo/internal/runtime.Slice", ptr %96, align 8 + %101 = call ptr @"github.com/goplus/llgo/internal/runtime.Struct"(%"github.com/goplus/llgo/internal/runtime.String" %93, %"github.com/goplus/llgo/internal/runtime.Slice" %100) + store ptr %101, ptr @"main.struct$MYpsoM99ZwFY087IpUOkIw1zjBA_sgFXVodmn1m-G88", align 8 } declare void @"github.com/goplus/llgo/_demo/interf/foo.init"() @@ -148,3 +224,9 @@ declare void @"github.com/goplus/llgo/internal/runtime.PrintByte"(i8) declare %"github.com/goplus/llgo/internal/runtime.eface" @"github.com/goplus/llgo/_demo/interf/foo.F"() declare void @"github.com/goplus/llgo/internal/runtime.PrintString"(%"github.com/goplus/llgo/internal/runtime.String") + +declare ptr @"github.com/goplus/llgo/internal/runtime.Struct"(i64, %"github.com/goplus/llgo/internal/runtime.String", %"github.com/goplus/llgo/internal/runtime.Slice") + +declare %"github.com/goplus/llgo/internal/abi.StructField" @"github.com/goplus/llgo/internal/runtime.StructField"(%"github.com/goplus/llgo/internal/runtime.String", ptr, i64, %"github.com/goplus/llgo/internal/runtime.String", i1, i1) + +declare ptr @"github.com/goplus/llgo/internal/runtime.AllocU"(i64) diff --git a/ssa/interface.go b/ssa/interface.go index 33cf27ec..374ce102 100644 --- a/ssa/interface.go +++ b/ssa/interface.go @@ -43,11 +43,12 @@ func (b Builder) abiStruct(t *types.Struct) Expr { prog := b.Prog g = pkg.doNewVar(name, prog.AbiTypePtrPtr()) g.Init(prog.Null(g.Type)) + g.impl.SetLinkage(llvm.LinkOnceAnyLinkage) + pkg.ainits = append(pkg.ainits, func() { + tabi := b.structOf(t) + b.Store(g.Expr, tabi) + }) } - pkg.abitys = append(pkg.abitys, func() { - tabi := b.structOf(t) - b.Store(g.Expr, tabi) - }) return b.Load(g.Expr) } @@ -65,7 +66,7 @@ func (b Builder) structOf(t *types.Struct) Expr { off := uintptr(prog.OffsetOf(typ, i)) flds[i] = b.structField(sfAbi, prog, f, off, t.Tag(i)) } - pkgPath := prog.Val(pkg.abi.Pkg) + pkgPath := b.Str(pkg.abi.Pkg) params := strucAbi.raw.Type.(*types.Signature).Params() tSlice := prog.rawType(params.At(params.Len() - 1).Type().(*types.Slice)) fldSlice := b.SliceLit(tSlice, flds...) @@ -74,11 +75,11 @@ func (b Builder) structOf(t *types.Struct) Expr { // func StructField(name string, typ *abi.Type, off uintptr, tag string, exported, embedded bool) abi.StructField func (b Builder) structField(sfAbi Expr, prog Program, f *types.Var, offset uintptr, tag string) Expr { - name := prog.Val(f.Name()) + name := b.Str(f.Name()) typ := b.abiType(f.Type()) exported := prog.Val(f.Exported()) embedded := prog.Val(f.Embedded()) - return b.Call(sfAbi, name, typ, prog.Val(offset), prog.Val(tag), exported, embedded) + return b.Call(sfAbi, name, typ, prog.Val(offset), b.Str(tag), exported, embedded) } // abiType returns the abi type of the specified type. diff --git a/ssa/package.go b/ssa/package.go index e7a47720..905fa966 100644 --- a/ssa/package.go +++ b/ssa/package.go @@ -490,7 +490,7 @@ func (p Program) Uint64() Type { type aPackage struct { mod llvm.Module abi abi.Builder - abitys []func() + ainits []func() vars map[string]Global fns map[string]Function stubs map[string]Function @@ -555,9 +555,12 @@ func (p Package) String() string { // AfterInit is called after the package is initialized (init all packages that depends on). func (p Package) AfterInit(b Builder, ret BasicBlock) { - doAfterInit := p.pyHasModSyms() + doAfterInit := len(p.ainits) > 0 || p.pyHasModSyms() if doAfterInit { b.SetBlockEx(ret, afterInit) + for _, afterInit := range p.ainits { + afterInit() + } p.pyLoadModSyms(b) } }