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

Merge commit 'd06146ed970f52d564521ff0be7d56839c85e497' into async-functions

Browse Source 
* commit 'd06146ed970f52d564521ff0be7d56839c85e497': (152 commits)
  perf(lib/sync): avoid using `defer`
  refactor(c-libuv): Added TODO(uid) comment & adjusted the position of Handle, Stream, Req, Write, Connect
  README: io/ioutil
  library: io/ioutil
  c/openssl: bio, pem, rsa
  refactor(c/libuv): Adapt libuv.Fs struct
  Revert "fix(c/libuv): Add libuv fs struct new func"
  fix(c/libuv): Fix async_fs demo return 255 error & pointer not allocated error
  fix(c/libuv): Add libuv fs struct new func
  doc/c:refine symbol visibility description
  README: math/big
  library: math/big.Int (mini-impl for _cmptest/bigintdemo)
  doc/c:update implicit destructors description
  c/openssl: bignum, rsa
  library: crypto
  library: crypto/{sha1, sha256, sha512}
  doc/c:fix incorrect usage in construtors
  doc/c:update destructor usage
  delete sum
  fix test error
  ...

# Conflicts:
#	ssa/eh.go
This commit is contained in:
Li Jie
2024-08-04 10:26:27 +08:00
parent efa771f3ff d06146ed97
commit e470bc2069
165 changed files with 11563 additions and 606 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cl/_testgo/closure/out.ll
View File

@@ -2,6 +2,7 @@
source_filename = "main"
%"github.com/goplus/llgo/internal/runtime.String" = type { ptr, i64 }
%main.T = type { ptr, ptr }
@"main.init$guard" = global i1 false, align 1
@__llgo_argc = global i32 0, align 4
@@ -37,12 +38,12 @@ _llgo_0:
store i64 3, ptr %5, align 4
%6 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %3, align 8
store %"github.com/goplus/llgo/internal/runtime.String" %6, ptr %2, align 8
%7 = alloca { ptr, ptr }, align 8
%8 = getelementptr inbounds { ptr, ptr }, ptr %7, i32 0, i32 0
%7 = alloca %main.T, align 8
%8 = getelementptr inbounds %main.T, ptr %7, i32 0, i32 0
store ptr @"__llgo_stub.main.main$1", ptr %8, align 8
%9 = getelementptr inbounds { ptr, ptr }, ptr %7, i32 0, i32 1
%9 = getelementptr inbounds %main.T, ptr %7, i32 0, i32 1
store ptr null, ptr %9, align 8
%10 = load { ptr, ptr }, ptr %7, align 8
%10 = load %main.T, ptr %7, align 8
%11 = call ptr @"github.com/goplus/llgo/internal/runtime.AllocU"(i64 8)
%12 = getelementptr inbounds { ptr }, ptr %11, i32 0, i32 0
store ptr %2, ptr %12, align 8
@@ -52,12 +53,15 @@ _llgo_0:
%15 = getelementptr inbounds { ptr, ptr }, ptr %13, i32 0, i32 1
store ptr %11, ptr %15, align 8
%16 = load { ptr, ptr }, ptr %13, align 8
%17 = extractvalue { ptr, ptr } %10, 1
%18 = extractvalue { ptr, ptr } %10, 0
call void %18(ptr %17, i64 100)
%19 = extractvalue { ptr, ptr } %16, 1
%20 = extractvalue { ptr, ptr } %16, 0
call void %20(ptr %19, i64 200)
%17 = alloca %main.T, align 8
store { ptr, ptr } %16, ptr %17, align 8
%18 = load %main.T, ptr %17, align 8
%19 = extractvalue %main.T %10, 1
%20 = extractvalue %main.T %10, 0
call void %20(ptr %19, i64 100)
%21 = extractvalue %main.T %18, 1
%22 = extractvalue %main.T %18, 0
call void %22(ptr %21, i64 200)
ret i32 0
}

17
cl/_testgo/defer5/in.go Normal file
View File

@@ -0,0 +1,17 @@
package main
func main() {
defer println("A")
defer func() {
if e := recover(); e != nil {
println("in defer 1")
panic("panic in defer 1")
}
}()
defer func() {
println("in defer 2")
panic("panic in defer 2")
}()
defer println("B")
panic("panic in main")
}

1
cl/_testgo/defer5/out.ll Normal file
View File

@@ -0,0 +1 @@
;

10
cl/_testgo/invoke/out.ll
View File

@@ -304,13 +304,13 @@ _llgo_0:
%14 = getelementptr inbounds %main.T5, ptr %13, i32 0, i32 0
store i64 300, ptr %14, align 4
%15 = call ptr @"github.com/goplus/llgo/internal/runtime.AllocZ"(i64 16)
%16 = alloca { ptr, ptr }, align 8
%17 = getelementptr inbounds { ptr, ptr }, ptr %16, i32 0, i32 0
%16 = alloca %main.T6, align 8
%17 = getelementptr inbounds %main.T6, ptr %16, i32 0, i32 0
store ptr @"__llgo_stub.main.main$1", ptr %17, align 8
%18 = getelementptr inbounds { ptr, ptr }, ptr %16, i32 0, i32 1
%18 = getelementptr inbounds %main.T6, ptr %16, i32 0, i32 1
store ptr null, ptr %18, align 8
%19 = load { ptr, ptr }, ptr %16, align 8
store { ptr, ptr } %19, ptr %15, align 8
%19 = load %main.T6, ptr %16, align 8
store %main.T6 %19, ptr %15, align 8
%20 = load %main.T, ptr %2, align 8
%21 = load ptr, ptr @_llgo_main.T, align 8
%22 = call ptr @"github.com/goplus/llgo/internal/runtime.AllocU"(i64 16)

15
cl/_testlibc/demangle/in.go Normal file
View File

@@ -0,0 +1,15 @@
package main
import (
"github.com/goplus/llgo/c"
"github.com/goplus/llgo/cpp/llvm"
)
func main() {
mangledName := "__ZNK9INIReader10ParseErrorEv"
if name := llvm.ItaniumDemangle(mangledName, true); name != nil {
c.Printf(c.Str("%s\n"), name)
} else {
println("Failed to demangle")
}
}

69
cl/_testlibc/demangle/out.ll Normal file
View File

@@ -0,0 +1,69 @@
; ModuleID = 'main'
source_filename = "main"
%"github.com/goplus/llgo/internal/runtime.String" = type { ptr, i64 }
@"main.init$guard" = global i1 false, align 1
@__llgo_argc = global i32 0, align 4
@__llgo_argv = global ptr null, align 8
@0 = private unnamed_addr constant [29 x i8] c"__ZNK9INIReader10ParseErrorEv", align 1
@1 = private unnamed_addr constant [4 x i8] c"%s\0A\00", align 1
@2 = private unnamed_addr constant [18 x i8] c"Failed to demangle", align 1
define void @main.init() {
_llgo_0:
%0 = load i1, ptr @"main.init$guard", align 1
br i1 %0, label %_llgo_2, label %_llgo_1
_llgo_1: ; preds = %_llgo_0
store i1 true, ptr @"main.init$guard", align 1
br label %_llgo_2
_llgo_2: ; preds = %_llgo_1, %_llgo_0
ret void
}
define i32 @main(i32 %0, ptr %1) {
_llgo_0:
store i32 %0, ptr @__llgo_argc, align 4
store ptr %1, ptr @__llgo_argv, align 8
call void @"github.com/goplus/llgo/internal/runtime.init"()
call void @main.init()
%2 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8
%3 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %2, i32 0, i32 0
store ptr @0, ptr %3, align 8
%4 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %2, i32 0, i32 1
store i64 29, ptr %4, align 4
%5 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %2, align 8
%6 = call ptr @_ZN4llvm15itaniumDemangleENSt3__117basic_string_viewIcNS0_11char_traitsIcEEEEb(%"github.com/goplus/llgo/internal/runtime.String" %5, i1 true)
%7 = icmp ne ptr %6, null
br i1 %7, label %_llgo_1, label %_llgo_3
_llgo_1: ; preds = %_llgo_0
%8 = call i32 (ptr, ...) @printf(ptr @1, ptr %6)
br label %_llgo_2
_llgo_2: ; preds = %_llgo_3, %_llgo_1
ret i32 0
_llgo_3: ; preds = %_llgo_0
%9 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8
%10 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %9, i32 0, i32 0
store ptr @2, ptr %10, align 8
%11 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %9, i32 0, i32 1
store i64 18, ptr %11, align 4
%12 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %9, align 8
call void @"github.com/goplus/llgo/internal/runtime.PrintString"(%"github.com/goplus/llgo/internal/runtime.String" %12)
call void @"github.com/goplus/llgo/internal/runtime.PrintByte"(i8 10)
br label %_llgo_2
}
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)
declare i32 @printf(ptr, ...)
declare void @"github.com/goplus/llgo/internal/runtime.PrintString"(%"github.com/goplus/llgo/internal/runtime.String")
declare void @"github.com/goplus/llgo/internal/runtime.PrintByte"(i8)

63
cl/_testrt/closureconv/in.go Normal file
View File

@@ -0,0 +1,63 @@
package main
type Func func(a int, b int) int
type Func2 func(a int, b int) int
type Call struct {
fn Func
n int
}
func (c *Call) add(a int, b int) int {
return a + b + c.n
}
func add(a int, b int) int {
return a + b
}
func demo1(n int) Func {
m := &Call{n: n}
m.fn = m.add
return m.fn
}
func demo2() Func {
m := &Call{}
return m.add
}
func demo3() Func {
return add
}
func demo4() Func {
return func(a, b int) int { return a + b }
}
func demo5(n int) Func {
return func(a, b int) int { return a + b + n }
}
func main() {
n1 := demo1(1)(99, 200)
println(n1)
n2 := demo2()(100, 200)
println(n2)
n3 := demo3()(100, 200)
println(n3)
n4 := demo4()(100, 200)
println(n4)
n5 := demo5(1)(99, 200)
println(n5)
var fn func(a int, b int) int = demo5(1)
println(fn(99, 200))
var fn2 Func2 = (Func2)(demo5(1))
println(fn2(99, 200))
}

220
cl/_testrt/closureconv/out.ll Normal file
View File

@@ -0,0 +1,220 @@
; ModuleID = 'main'
source_filename = "main"
%main.Call = type { %main.Func, i64 }
%main.Func = type { ptr, ptr }
@"main.init$guard" = global i1 false, align 1
@__llgo_argc = global i32 0, align 4
@__llgo_argv = global ptr null, align 8
define i64 @"main.(*Call).add"(ptr %0, i64 %1, i64 %2) {
_llgo_0:
%3 = add i64 %1, %2
%4 = getelementptr inbounds %main.Call, ptr %0, i32 0, i32 1
%5 = load i64, ptr %4, align 4
%6 = add i64 %3, %5
ret i64 %6
}
define i64 @main.add(i64 %0, i64 %1) {
_llgo_0:
%2 = add i64 %0, %1
ret i64 %2
}
define %main.Func @main.demo1(i64 %0) {
_llgo_0:
%1 = call ptr @"github.com/goplus/llgo/internal/runtime.AllocZ"(i64 24)
%2 = getelementptr inbounds %main.Call, ptr %1, i32 0, i32 1
store i64 %0, ptr %2, align 4
%3 = call ptr @"github.com/goplus/llgo/internal/runtime.AllocU"(i64 8)
%4 = getelementptr inbounds { ptr }, ptr %3, i32 0, i32 0
store ptr %1, ptr %4, align 8
%5 = alloca { ptr, ptr }, align 8
%6 = getelementptr inbounds { ptr, ptr }, ptr %5, i32 0, i32 0
store ptr @"main.add$bound", ptr %6, align 8
%7 = getelementptr inbounds { ptr, ptr }, ptr %5, i32 0, i32 1
store ptr %3, ptr %7, align 8
%8 = load { ptr, ptr }, ptr %5, align 8
%9 = getelementptr inbounds %main.Call, ptr %1, i32 0, i32 0
%10 = alloca %main.Func, align 8
store { ptr, ptr } %8, ptr %10, align 8
%11 = load %main.Func, ptr %10, align 8
store %main.Func %11, ptr %9, align 8
%12 = getelementptr inbounds %main.Call, ptr %1, i32 0, i32 0
%13 = load %main.Func, ptr %12, align 8
ret %main.Func %13
}
define %main.Func @main.demo2() {
_llgo_0:
%0 = call ptr @"github.com/goplus/llgo/internal/runtime.AllocZ"(i64 24)
%1 = call ptr @"github.com/goplus/llgo/internal/runtime.AllocU"(i64 8)
%2 = getelementptr inbounds { ptr }, ptr %1, i32 0, i32 0
store ptr %0, ptr %2, align 8
%3 = alloca { ptr, ptr }, align 8
%4 = getelementptr inbounds { ptr, ptr }, ptr %3, i32 0, i32 0
store ptr @"main.add$bound", ptr %4, align 8
%5 = getelementptr inbounds { ptr, ptr }, ptr %3, i32 0, i32 1
store ptr %1, ptr %5, align 8
%6 = load { ptr, ptr }, ptr %3, align 8
%7 = alloca %main.Func, align 8
store { ptr, ptr } %6, ptr %7, align 8
%8 = load %main.Func, ptr %7, align 8
ret %main.Func %8
}
define %main.Func @main.demo3() {
_llgo_0:
%0 = alloca %main.Func, align 8
%1 = getelementptr inbounds %main.Func, ptr %0, i32 0, i32 0
store ptr @__llgo_stub.main.add, ptr %1, align 8
%2 = getelementptr inbounds %main.Func, ptr %0, i32 0, i32 1
store ptr null, ptr %2, align 8
%3 = load %main.Func, ptr %0, align 8
ret %main.Func %3
}
define %main.Func @main.demo4() {
_llgo_0:
%0 = alloca %main.Func, align 8
%1 = getelementptr inbounds %main.Func, ptr %0, i32 0, i32 0
store ptr @"__llgo_stub.main.demo4$1", ptr %1, align 8
%2 = getelementptr inbounds %main.Func, ptr %0, i32 0, i32 1
store ptr null, ptr %2, align 8
%3 = load %main.Func, ptr %0, align 8
ret %main.Func %3
}
define i64 @"main.demo4$1"(i64 %0, i64 %1) {
_llgo_0:
%2 = add i64 %0, %1
ret i64 %2
}
define %main.Func @main.demo5(i64 %0) {
_llgo_0:
%1 = call ptr @"github.com/goplus/llgo/internal/runtime.AllocZ"(i64 8)
store i64 %0, ptr %1, align 4
%2 = call ptr @"github.com/goplus/llgo/internal/runtime.AllocU"(i64 8)
%3 = getelementptr inbounds { ptr }, ptr %2, i32 0, i32 0
store ptr %1, ptr %3, align 8
%4 = alloca { ptr, ptr }, align 8
%5 = getelementptr inbounds { ptr, ptr }, ptr %4, i32 0, i32 0
store ptr @"main.demo5$1", ptr %5, align 8
%6 = getelementptr inbounds { ptr, ptr }, ptr %4, i32 0, i32 1
store ptr %2, ptr %6, align 8
%7 = load { ptr, ptr }, ptr %4, align 8
%8 = alloca %main.Func, align 8
store { ptr, ptr } %7, ptr %8, align 8
%9 = load %main.Func, ptr %8, align 8
ret %main.Func %9
}
define i64 @"main.demo5$1"(ptr %0, i64 %1, i64 %2) {
_llgo_0:
%3 = add i64 %1, %2
%4 = load { ptr }, ptr %0, align 8
%5 = extractvalue { ptr } %4, 0
%6 = load i64, ptr %5, align 4
%7 = add i64 %3, %6
ret i64 %7
}
define void @main.init() {
_llgo_0:
%0 = load i1, ptr @"main.init$guard", align 1
br i1 %0, label %_llgo_2, label %_llgo_1
_llgo_1: ; preds = %_llgo_0
store i1 true, ptr @"main.init$guard", align 1
br label %_llgo_2
_llgo_2: ; preds = %_llgo_1, %_llgo_0
ret void
}
define i32 @main(i32 %0, ptr %1) {
_llgo_0:
store i32 %0, ptr @__llgo_argc, align 4
store ptr %1, ptr @__llgo_argv, align 8
call void @"github.com/goplus/llgo/internal/runtime.init"()
call void @main.init()
%2 = call %main.Func @main.demo1(i64 1)
%3 = extractvalue %main.Func %2, 1
%4 = extractvalue %main.Func %2, 0
%5 = call i64 %4(ptr %3, i64 99, i64 200)
call void @"github.com/goplus/llgo/internal/runtime.PrintInt"(i64 %5)
call void @"github.com/goplus/llgo/internal/runtime.PrintByte"(i8 10)
%6 = call %main.Func @main.demo2()
%7 = extractvalue %main.Func %6, 1
%8 = extractvalue %main.Func %6, 0
%9 = call i64 %8(ptr %7, i64 100, i64 200)
call void @"github.com/goplus/llgo/internal/runtime.PrintInt"(i64 %9)
call void @"github.com/goplus/llgo/internal/runtime.PrintByte"(i8 10)
%10 = call %main.Func @main.demo3()
%11 = extractvalue %main.Func %10, 1
%12 = extractvalue %main.Func %10, 0
%13 = call i64 %12(ptr %11, i64 100, i64 200)
call void @"github.com/goplus/llgo/internal/runtime.PrintInt"(i64 %13)
call void @"github.com/goplus/llgo/internal/runtime.PrintByte"(i8 10)
%14 = call %main.Func @main.demo4()
%15 = extractvalue %main.Func %14, 1
%16 = extractvalue %main.Func %14, 0
%17 = call i64 %16(ptr %15, i64 100, i64 200)
call void @"github.com/goplus/llgo/internal/runtime.PrintInt"(i64 %17)
call void @"github.com/goplus/llgo/internal/runtime.PrintByte"(i8 10)
%18 = call %main.Func @main.demo5(i64 1)
%19 = extractvalue %main.Func %18, 1
%20 = extractvalue %main.Func %18, 0
%21 = call i64 %20(ptr %19, i64 99, i64 200)
call void @"github.com/goplus/llgo/internal/runtime.PrintInt"(i64 %21)
call void @"github.com/goplus/llgo/internal/runtime.PrintByte"(i8 10)
%22 = call %main.Func @main.demo5(i64 1)
%23 = alloca { ptr, ptr }, align 8
store %main.Func %22, ptr %23, align 8
%24 = load { ptr, ptr }, ptr %23, align 8
%25 = extractvalue { ptr, ptr } %24, 1
%26 = extractvalue { ptr, ptr } %24, 0
%27 = call i64 %26(ptr %25, i64 99, i64 200)
call void @"github.com/goplus/llgo/internal/runtime.PrintInt"(i64 %27)
call void @"github.com/goplus/llgo/internal/runtime.PrintByte"(i8 10)
%28 = call %main.Func @main.demo5(i64 1)
%29 = extractvalue %main.Func %28, 1
%30 = extractvalue %main.Func %28, 0
%31 = call i64 %30(ptr %29, i64 99, i64 200)
call void @"github.com/goplus/llgo/internal/runtime.PrintInt"(i64 %31)
call void @"github.com/goplus/llgo/internal/runtime.PrintByte"(i8 10)
ret i32 0
}
declare ptr @"github.com/goplus/llgo/internal/runtime.AllocZ"(i64)
define i64 @"main.add$bound"(ptr %0, i64 %1, i64 %2) {
_llgo_0:
%3 = load { ptr }, ptr %0, align 8
%4 = extractvalue { ptr } %3, 0
%5 = call i64 @"main.(*Call).add"(ptr %4, i64 %1, i64 %2)
ret i64 %5
}
declare ptr @"github.com/goplus/llgo/internal/runtime.AllocU"(i64)
define linkonce i64 @__llgo_stub.main.add(ptr %0, i64 %1, i64 %2) {
_llgo_0:
%3 = tail call i64 @main.add(i64 %1, i64 %2)
ret i64 %3
}
define linkonce i64 @"__llgo_stub.main.demo4$1"(ptr %0, i64 %1, i64 %2) {
_llgo_0:
%3 = tail call i64 @"main.demo4$1"(i64 %1, i64 %2)
ret i64 %3
}
declare void @"github.com/goplus/llgo/internal/runtime.init"()
declare void @"github.com/goplus/llgo/internal/runtime.PrintInt"(i64)
declare void @"github.com/goplus/llgo/internal/runtime.PrintByte"(i8)

12
cl/_testrt/makemap/in.go
View File

@@ -6,6 +6,7 @@ func main() {
make3()
make4()
make5()
make6()
}
func make1() {
@@ -101,3 +102,14 @@ func make5() {
println(k, v)
}
}
type M map[int]string
func make6() {
var m M
m = make(map[int]string)
m[1] = "hello"
for k, v := range m {
println(k, v)
}
}

102
cl/_testrt/makemap/out.ll
View File

@@ -46,6 +46,8 @@ source_filename = "main"
@"chan _llgo_int" = linkonce global ptr null, align 8
@19 = private unnamed_addr constant [4 x i8] c"chan", align 1
@"map[chan _llgo_int]_llgo_int" = linkonce global ptr null, align 8
@_llgo_main.M = linkonce global ptr null, align 8
@20 = private unnamed_addr constant [1 x i8] c"M", align 1
define void @main.init() {
_llgo_0:
@@ -72,6 +74,7 @@ _llgo_0:
call void @main.make3()
call void @main.make4()
call void @main.make5()
call void @main.make6()
ret i32 0
}
@@ -998,6 +1001,74 @@ _llgo_6: ; preds = %_llgo_5, %_llgo_4
br i1 %41, label %_llgo_2, label %_llgo_3
}
define void @main.make6() {
_llgo_0:
%0 = load ptr, ptr @"map[_llgo_int]_llgo_string", align 8
%1 = call ptr @"github.com/goplus/llgo/internal/runtime.MakeMap"(ptr %0, i64 0)
%2 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8
%3 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %2, i32 0, i32 0
store ptr @5, ptr %3, align 8
%4 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %2, i32 0, i32 1
store i64 5, ptr %4, align 4
%5 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %2, align 8
%6 = load ptr, ptr @_llgo_main.M, align 8
%7 = call ptr @"github.com/goplus/llgo/internal/runtime.AllocU"(i64 8)
store i64 1, ptr %7, align 4
%8 = call ptr @"github.com/goplus/llgo/internal/runtime.MapAssign"(ptr %6, ptr %1, ptr %7)
store %"github.com/goplus/llgo/internal/runtime.String" %5, ptr %8, align 8
%9 = load ptr, ptr @_llgo_main.M, align 8
%10 = call ptr @"github.com/goplus/llgo/internal/runtime.NewMapIter"(ptr %9, ptr %1)
br label %_llgo_1
_llgo_1: ; preds = %_llgo_2, %_llgo_0
%11 = call { i1, ptr, ptr } @"github.com/goplus/llgo/internal/runtime.MapIterNext"(ptr %10)
%12 = extractvalue { i1, ptr, ptr } %11, 0
br i1 %12, label %_llgo_4, label %_llgo_5
_llgo_2: ; preds = %_llgo_6
%13 = extractvalue { i1, i64, %"github.com/goplus/llgo/internal/runtime.String" } %29, 1
%14 = extractvalue { i1, i64, %"github.com/goplus/llgo/internal/runtime.String" } %29, 2
call void @"github.com/goplus/llgo/internal/runtime.PrintInt"(i64 %13)
call void @"github.com/goplus/llgo/internal/runtime.PrintByte"(i8 32)
call void @"github.com/goplus/llgo/internal/runtime.PrintString"(%"github.com/goplus/llgo/internal/runtime.String" %14)
call void @"github.com/goplus/llgo/internal/runtime.PrintByte"(i8 10)
br label %_llgo_1
_llgo_3: ; preds = %_llgo_6
ret void
_llgo_4: ; preds = %_llgo_1
%15 = extractvalue { i1, ptr, ptr } %11, 1
%16 = extractvalue { i1, ptr, ptr } %11, 2
%17 = load i64, ptr %15, align 4
%18 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %16, align 8
%19 = alloca { i1, i64, %"github.com/goplus/llgo/internal/runtime.String" }, align 8
%20 = getelementptr inbounds { i1, i64, %"github.com/goplus/llgo/internal/runtime.String" }, ptr %19, i32 0, i32 0
store i1 true, ptr %20, align 1
%21 = getelementptr inbounds { i1, i64, %"github.com/goplus/llgo/internal/runtime.String" }, ptr %19, i32 0, i32 1
store i64 %17, ptr %21, align 4
%22 = getelementptr inbounds { i1, i64, %"github.com/goplus/llgo/internal/runtime.String" }, ptr %19, i32 0, i32 2
store %"github.com/goplus/llgo/internal/runtime.String" %18, ptr %22, align 8
%23 = load { i1, i64, %"github.com/goplus/llgo/internal/runtime.String" }, ptr %19, align 8
br label %_llgo_6
_llgo_5: ; preds = %_llgo_1
%24 = alloca { i1, i64, %"github.com/goplus/llgo/internal/runtime.String" }, align 8
%25 = getelementptr inbounds { i1, i64, %"github.com/goplus/llgo/internal/runtime.String" }, ptr %24, i32 0, i32 0
store i1 false, ptr %25, align 1
%26 = getelementptr inbounds { i1, i64, %"github.com/goplus/llgo/internal/runtime.String" }, ptr %24, i32 0, i32 1
store i64 0, ptr %26, align 4
%27 = getelementptr inbounds { i1, i64, %"github.com/goplus/llgo/internal/runtime.String" }, ptr %24, i32 0, i32 2
store %"github.com/goplus/llgo/internal/runtime.String" zeroinitializer, ptr %27, align 8
%28 = load { i1, i64, %"github.com/goplus/llgo/internal/runtime.String" }, ptr %24, align 8
br label %_llgo_6
_llgo_6: ; preds = %_llgo_5, %_llgo_4
%29 = phi { i1, i64, %"github.com/goplus/llgo/internal/runtime.String" } [ %23, %_llgo_4 ], [ %28, %_llgo_5 ]
%30 = extractvalue { i1, i64, %"github.com/goplus/llgo/internal/runtime.String" } %29, 0
br i1 %30, label %_llgo_2, label %_llgo_3
}
declare void @"github.com/goplus/llgo/internal/runtime.init"()
define void @"main.init$after"() {
@@ -1697,6 +1768,37 @@ _llgo_37: ; preds = %_llgo_36
br label %_llgo_38
_llgo_38: ; preds = %_llgo_37, %_llgo_36
%402 = call ptr @"github.com/goplus/llgo/internal/runtime.NewNamed"(i64 21, i64 8, i64 0, i64 0)
%403 = load ptr, ptr @_llgo_main.M, align 8
%404 = icmp eq ptr %403, null
br i1 %404, label %_llgo_39, label %_llgo_40
_llgo_39: ; preds = %_llgo_38
call void @"github.com/goplus/llgo/internal/runtime.SetDirectIface"(ptr %402)
store ptr %402, ptr @_llgo_main.M, align 8
br label %_llgo_40
_llgo_40: ; preds = %_llgo_39, %_llgo_38
%405 = load ptr, ptr @"map[_llgo_int]_llgo_string", align 8
br i1 %404, label %_llgo_41, label %_llgo_42
_llgo_41: ; preds = %_llgo_40
%406 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8
%407 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %406, i32 0, i32 0
store ptr @4, ptr %407, align 8
%408 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %406, i32 0, i32 1
store i64 4, ptr %408, align 4
%409 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %406, align 8
%410 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8
%411 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %410, i32 0, i32 0
store ptr @20, ptr %411, align 8
%412 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %410, i32 0, i32 1
store i64 1, ptr %412, align 4
%413 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %410, align 8
call void @"github.com/goplus/llgo/internal/runtime.InitNamed"(ptr %402, %"github.com/goplus/llgo/internal/runtime.String" %409, %"github.com/goplus/llgo/internal/runtime.String" %413, ptr %405, { ptr, i64, i64 } zeroinitializer, { ptr, i64, i64 } zeroinitializer)
br label %_llgo_42
_llgo_42: ; preds = %_llgo_41, %_llgo_40
ret void
}

7
cl/compile.go
View File

@@ -195,6 +195,9 @@ func (p *context) compileFuncDecl(pkg llssa.Package, f *ssa.Function) (llssa.Fun
isInit := (f.Name() == "init" && sig.Recv() == nil)
if isInit && state == pkgHasPatch {
name = initFnNameOfHasPatch(name)
// TODO(xsw): pkg.init$guard has been set, change ssa.If to ssa.Jump
block := f.Blocks[0].Instrs[1].(*ssa.If).Block()
block.Succs[0], block.Succs[1] = block.Succs[1], block.Succs[0]
}
fn := pkg.FuncOf(name)
@@ -298,7 +301,7 @@ func (p *context) compileBlock(b llssa.Builder, block *ssa.BasicBlock, n int, do
if pyModInit = p.pyMod != ""; pyModInit {
last = len(instrs) - 1
instrs = instrs[:last]
} else {
} else if p.state != pkgHasPatch {
// TODO(xsw): confirm pyMod don't need to call AfterInit
p.inits = append(p.inits, func() {
pkg.AfterInit(b, ret)
@@ -315,7 +318,7 @@ func (p *context) compileBlock(b llssa.Builder, block *ssa.BasicBlock, n int, do
b.Call(pkg.FuncOf("main.init").Expr)
}
for i, instr := range instrs {
if i == 1 && doModInit && p.state == pkgInPatch {
if i == 1 && doModInit && p.state == pkgInPatch { // in patch package but no pkgFNoOldInit
initFnNameOld := initFnNameOfHasPatch(p.fn.Name())
fnOld := pkg.NewFunc(initFnNameOld, llssa.NoArgsNoRet, llssa.InC)
b.Call(fnOld.Expr)

71
cl/import.go
View File

@@ -509,41 +509,6 @@ func (p *context) ensureLoaded(pkgTypes *types.Package) *types.Package {
return pkgTypes
}
func pkgKindByPath(pkgPath string) int {
switch pkgPath {
case "runtime/cgo", "unsafe":
return PkgDeclOnly
}
return PkgNormal
}
func replaceGoName(v string, pos int) string {
switch v[:pos] {
case "runtime":
return "github.com/goplus/llgo/internal/runtime" + v[pos:]
}
return v
}
func ignoreName(name string) bool {
/* TODO(xsw): confirm this is not needed more
if name == "unsafe.init" {
return true
}
*/
const internal = "internal/"
return (strings.HasPrefix(name, internal) && !supportedInternal(name[len(internal):])) ||
strings.HasPrefix(name, "crypto/") || strings.HasPrefix(name, "runtime/") ||
strings.HasPrefix(name, "arena.") || strings.HasPrefix(name, "maps.") ||
strings.HasPrefix(name, "plugin.")
}
func supportedInternal(name string) bool {
return strings.HasPrefix(name, "abi.") || strings.HasPrefix(name, "bytealg.") ||
strings.HasPrefix(name, "oserror.") || strings.HasPrefix(name, "reflectlite.") ||
strings.HasPrefix(name, "syscall/unix.") || strings.HasPrefix(name, "syscall/execenv.")
}
// -----------------------------------------------------------------------------
const (
@@ -609,3 +574,39 @@ func toBackground(bg string) llssa.Background {
}
// -----------------------------------------------------------------------------
func pkgKindByPath(pkgPath string) int {
switch pkgPath {
case "runtime/cgo", "unsafe":
return PkgDeclOnly
}
return PkgNormal
}
func replaceGoName(v string, pos int) string {
switch v[:pos] {
case "runtime":
return "github.com/goplus/llgo/internal/runtime" + v[pos:]
}
return v
}
func ignoreName(name string) bool {
/* TODO(xsw): confirm this is not needed more
if name == "unsafe.init" {
return true
}
*/
const internal = "internal/"
return (strings.HasPrefix(name, internal) && !supportedInternal(name[len(internal):])) ||
strings.HasPrefix(name, "runtime/") || strings.HasPrefix(name, "arena.") ||
strings.HasPrefix(name, "maps.") || strings.HasPrefix(name, "plugin.")
}
func supportedInternal(name string) bool {
return strings.HasPrefix(name, "abi.") || strings.HasPrefix(name, "bytealg.") ||
strings.HasPrefix(name, "itoa.") || strings.HasPrefix(name, "oserror.") || strings.HasPrefix(name, "reflectlite.") ||
strings.HasPrefix(name, "syscall/unix.") || strings.HasPrefix(name, "syscall/execenv.")
}
// -----------------------------------------------------------------------------