Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cl: PkgLinkIR/PkgLinkExtern support init if not using cgo #807

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+46 −1
Open

cl: PkgLinkIR/PkgLinkExtern support init if not using cgo #807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions cl/_testlibc/demangle/out.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ _llgo_0:

_llgo_1: ; preds = %_llgo_0
store i1 true, ptr @"main.init$guard", align 1
call void @"github.com/goplus/llgo/cpp/llvm.init"()
br label %_llgo_2

_llgo_2: ; preds = %_llgo_1, %_llgo_0
Expand Down Expand Up @@ -58,6 +59,8 @@ _llgo_3: ; preds = %_llgo_0
br label %_llgo_2
}

declare void @"github.com/goplus/llgo/cpp/llvm.init"()

declare void @"github.com/goplus/llgo/internal/runtime.init"()

declare ptr @_ZN4llvm15itaniumDemangleENSt3__117basic_string_viewIcNS0_11char_traitsIcEEEEb(%"github.com/goplus/llgo/internal/runtime.String", i1)
Expand Down
3 changes: 3 additions & 0 deletions cl/_testlibc/sqlite/out.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ _llgo_0:

_llgo_1: ; preds = %_llgo_0
store i1 true, ptr @"main.init$guard", align 1
call void @"github.com/goplus/llgo/c/sqlite.init"()
br label %_llgo_2

_llgo_2: ; preds = %_llgo_1, %_llgo_0
Expand All @@ -55,6 +56,8 @@ declare i32 @printf(ptr, ...)

declare void @exit(i32)

declare void @"github.com/goplus/llgo/c/sqlite.init"()

declare void @"github.com/goplus/llgo/internal/runtime.init"()

declare { ptr, i32 } @"github.com/goplus/llgo/c/sqlite.OpenV2"(ptr, i32, ptr)
Expand Down
3 changes: 3 additions & 0 deletions cl/_testpy/callpy/out.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ _llgo_0:

_llgo_1: ; preds = %_llgo_0
store i1 true, ptr @"main.init$guard", align 1
call void @"github.com/goplus/llgo/py.init"()
call void @"github.com/goplus/llgo/py/math.init"()
call void @"github.com/goplus/llgo/py/os.init"()
call void @"github.com/goplus/llgo/py/std.init"()
Expand Down Expand Up @@ -58,6 +59,8 @@ _llgo_0:
ret i32 0
}

declare void @"github.com/goplus/llgo/py.init"()

declare void @"github.com/goplus/llgo/py/math.init"()

declare void @"github.com/goplus/llgo/py/os.init"()
Expand Down
3 changes: 3 additions & 0 deletions cl/_testpy/gcd/out.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ _llgo_0:

_llgo_1: ; preds = %_llgo_0
store i1 true, ptr @"main.init$guard", align 1
call void @"github.com/goplus/llgo/py.init"()
call void @"github.com/goplus/llgo/py/math.init"()
%1 = load ptr, ptr @__llgo_py.math, align 8
call void (ptr, ...) @llgoLoadPyModSyms(ptr %1, ptr @1, ptr @__llgo_py.math.gcd, ptr null)
Expand All @@ -42,6 +43,8 @@ _llgo_0:
ret i32 0
}

declare void @"github.com/goplus/llgo/py.init"()

declare void @"github.com/goplus/llgo/py/math.init"()

declare void @"github.com/goplus/llgo/internal/runtime.init"()
Expand Down
3 changes: 3 additions & 0 deletions cl/_testpy/math/out.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ _llgo_0:

_llgo_1: ; preds = %_llgo_0
store i1 true, ptr @"math.init$guard", align 1
call void @"github.com/goplus/llgo/py.init"()
%1 = load ptr, ptr @__llgo_py.math, align 8
%2 = icmp ne ptr %1, null
br i1 %2, label %_llgo_2, label %_llgo_3
Expand All @@ -25,4 +26,6 @@ _llgo_3: ; preds = %_llgo_1
br label %_llgo_2
}

declare void @"github.com/goplus/llgo/py.init"()

declare ptr @PyImport_ImportModule(ptr)
3 changes: 3 additions & 0 deletions cl/_testpy/matrix/out.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ _llgo_0:

_llgo_1: ; preds = %_llgo_0
store i1 true, ptr @"main.init$guard", align 1
call void @"github.com/goplus/llgo/py.init"()
call void @"github.com/goplus/llgo/py/numpy.init"()
%1 = load ptr, ptr @__llgo_py.numpy, align 8
call void (ptr, ...) @llgoLoadPyModSyms(ptr %1, ptr @3, ptr @__llgo_py.numpy.add, ptr null)
Expand Down Expand Up @@ -98,6 +99,8 @@ _llgo_0:
ret i32 0
}

declare void @"github.com/goplus/llgo/py.init"()

declare void @"github.com/goplus/llgo/py/numpy.init"()

declare void @"github.com/goplus/llgo/internal/runtime.init"()
Expand Down
3 changes: 3 additions & 0 deletions cl/_testpy/max/out.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ _llgo_0:

_llgo_1: ; preds = %_llgo_0
store i1 true, ptr @"main.init$guard", align 1
call void @"github.com/goplus/llgo/py.init"()
call void @"github.com/goplus/llgo/py/std.init"()
%1 = load ptr, ptr @__llgo_py.builtins, align 8
call void (ptr, ...) @llgoLoadPyModSyms(ptr %1, ptr @0, ptr @__llgo_py.builtins.iter, ptr @1, ptr @__llgo_py.builtins.max, ptr @2, ptr @__llgo_py.builtins.print, ptr null)
Expand Down Expand Up @@ -74,6 +75,8 @@ _llgo_0:
ret i32 0
}

declare void @"github.com/goplus/llgo/py.init"()

declare void @"github.com/goplus/llgo/py/std.init"()

declare void @"github.com/goplus/llgo/internal/runtime.init"()
Expand Down
3 changes: 3 additions & 0 deletions cl/_testpy/pow/out.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ _llgo_0:

_llgo_1: ; preds = %_llgo_0
store i1 true, ptr @"main.init$guard", align 1
call void @"github.com/goplus/llgo/py.init"()
call void @"github.com/goplus/llgo/py/math.init"()
%1 = load ptr, ptr @__llgo_py.math, align 8
call void (ptr, ...) @llgoLoadPyModSyms(ptr %1, ptr @1, ptr @__llgo_py.math.pow, ptr null)
Expand All @@ -41,6 +42,8 @@ _llgo_0:
ret i32 0
}

declare void @"github.com/goplus/llgo/py.init"()

declare void @"github.com/goplus/llgo/py/math.init"()

declare void @"github.com/goplus/llgo/internal/runtime.init"()
Expand Down
23 changes: 22 additions & 1 deletion cl/instr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,10 +300,31 @@ func (p *context) funcKind(vfn ssa.Value) int {
return fnNormal
}

func usingCgo(pkg *types.Package) bool {
var n int
for _, im := range pkg.Imports() {
switch im.Path() {
case "syscall", "runtime/cgo":
n++
if n == 2 {
return true
}
}
}
return false
}

func (p *context) pkgNoInit(pkg *types.Package) bool {
p.ensureLoaded(pkg)
if i, ok := p.loaded[pkg]; ok {
return i.kind >= PkgNoInit
switch i.kind {
case PkgNoInit, PkgDeclOnly:
return true
case PkgLinkIR, PkgLinkExtern:
if usingCgo(pkg) {
return true
}
}
}
return false
}
Expand Down
Binary file modified py/llgo_autogen.lla
View file
Open in desktop
Binary file not shown.
Binary file modified py/math/llgo_autogen.lla
View file
Open in desktop
Binary file not shown.
Loading