feat: upgrade to x/tools 0.28

This commit is contained in:
Li Jie
2024-11-29 14:23:46 +08:00
parent db3f6e077e
commit 03b469212e
29 changed files with 202 additions and 153 deletions

View File

@@ -36,7 +36,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: '1.20'
go-version: '1.23'
- name: Install dependencies on macOS
if: startsWith(matrix.os, 'macos')

View File

@@ -18,7 +18,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: '1.20'
go-version: '1.23'
- name: Check formatting
run: |
@@ -93,7 +93,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: '1.20'
go-version: '1.23'
- name: Build
run: go build -v ./...

View File

@@ -857,10 +857,10 @@ _llgo_11: ; preds = %_llgo_8
%14 = fcmp olt double %13, 0.000000e+00
br i1 %14, label %_llgo_14, label %_llgo_12
_llgo_12: ; preds = %_llgo_24, %_llgo_22, %_llgo_14, %_llgo_11
%15 = phi double [ %0, %_llgo_11 ], [ %33, %_llgo_22 ], [ %0, %_llgo_14 ], [ %39, %_llgo_24 ]
%16 = phi i64 [ 0, %_llgo_11 ], [ %29, %_llgo_22 ], [ 0, %_llgo_14 ], [ %38, %_llgo_24 ]
br label %_llgo_27
_llgo_12: ; preds = %_llgo_24, %_llgo_23, %_llgo_14, %_llgo_11
%15 = phi double [ %0, %_llgo_11 ], [ %36, %_llgo_23 ], [ %0, %_llgo_14 ], [ %39, %_llgo_24 ]
%16 = phi i64 [ 0, %_llgo_11 ], [ %29, %_llgo_23 ], [ 0, %_llgo_14 ], [ %38, %_llgo_24 ]
br label %_llgo_25
_llgo_13: ; preds = %_llgo_8
%17 = fcmp olt double %0, 0.000000e+00
@@ -894,7 +894,7 @@ _llgo_18: ; preds = %_llgo_20
br label %_llgo_20
_llgo_19: ; preds = %_llgo_20
br label %_llgo_23
br label %_llgo_21
_llgo_20: ; preds = %_llgo_18, %_llgo_17
%28 = phi double [ %23, %_llgo_17 ], [ %27, %_llgo_18 ]
@@ -902,72 +902,72 @@ _llgo_20: ; preds = %_llgo_18, %_llgo_17
%30 = fcmp olt double %28, 1.000000e+00
br i1 %30, label %_llgo_18, label %_llgo_19
_llgo_21: ; preds = %_llgo_23
%31 = fdiv double %35, 1.000000e+01
%32 = add i64 %36, 1
br label %_llgo_23
_llgo_21: ; preds = %_llgo_22, %_llgo_19
%31 = phi double [ 5.000000e+00, %_llgo_19 ], [ %34, %_llgo_22 ]
%32 = phi i64 [ 0, %_llgo_19 ], [ %35, %_llgo_22 ]
%33 = icmp slt i64 %32, 7
br i1 %33, label %_llgo_22, label %_llgo_23
_llgo_22: ; preds = %_llgo_23
%33 = fadd double %28, %35
%34 = fcmp oge double %33, 1.000000e+01
br i1 %34, label %_llgo_24, label %_llgo_12
_llgo_22: ; preds = %_llgo_21
%34 = fdiv double %31, 1.000000e+01
%35 = add i64 %32, 1
br label %_llgo_21
_llgo_23: ; preds = %_llgo_21, %_llgo_19
%35 = phi double [ 5.000000e+00, %_llgo_19 ], [ %31, %_llgo_21 ]
%36 = phi i64 [ 0, %_llgo_19 ], [ %32, %_llgo_21 ]
%37 = icmp slt i64 %36, 7
br i1 %37, label %_llgo_21, label %_llgo_22
_llgo_23: ; preds = %_llgo_21
%36 = fadd double %28, %31
%37 = fcmp oge double %36, 1.000000e+01
br i1 %37, label %_llgo_24, label %_llgo_12
_llgo_24: ; preds = %_llgo_22
_llgo_24: ; preds = %_llgo_23
%38 = add i64 %29, 1
%39 = fdiv double %33, 1.000000e+01
%39 = fdiv double %36, 1.000000e+01
br label %_llgo_12
_llgo_25: ; preds = %_llgo_27
%40 = fptosi double %59 to i64
%41 = add i64 %60, 2
%42 = add i64 %40, 48
%43 = trunc i64 %42 to i8
%44 = icmp slt i64 %41, 0
%45 = icmp sge i64 %41, 14
%46 = or i1 %45, %44
call void @"github.com/goplus/llgo/internal/runtime.AssertIndexRange"(i1 %46)
%47 = getelementptr inbounds i8, ptr %8, i64 %41
store i8 %43, ptr %47, align 1
%48 = sitofp i64 %40 to double
%49 = fsub double %59, %48
%50 = fmul double %49, 1.000000e+01
%51 = add i64 %60, 1
br label %_llgo_27
_llgo_25: ; preds = %_llgo_26, %_llgo_12
%40 = phi double [ %15, %_llgo_12 ], [ %53, %_llgo_26 ]
%41 = phi i64 [ 0, %_llgo_12 ], [ %54, %_llgo_26 ]
%42 = icmp slt i64 %41, 7
br i1 %42, label %_llgo_26, label %_llgo_27
_llgo_26: ; preds = %_llgo_27
%52 = getelementptr inbounds i8, ptr %8, i64 2
%53 = load i8, ptr %52, align 1
%54 = getelementptr inbounds i8, ptr %8, i64 1
store i8 %53, ptr %54, align 1
_llgo_26: ; preds = %_llgo_25
%43 = fptosi double %40 to i64
%44 = add i64 %41, 2
%45 = add i64 %43, 48
%46 = trunc i64 %45 to i8
%47 = icmp slt i64 %44, 0
%48 = icmp sge i64 %44, 14
%49 = or i1 %48, %47
call void @"github.com/goplus/llgo/internal/runtime.AssertIndexRange"(i1 %49)
%50 = getelementptr inbounds i8, ptr %8, i64 %44
store i8 %46, ptr %50, align 1
%51 = sitofp i64 %43 to double
%52 = fsub double %40, %51
%53 = fmul double %52, 1.000000e+01
%54 = add i64 %41, 1
br label %_llgo_25
_llgo_27: ; preds = %_llgo_25
%55 = getelementptr inbounds i8, ptr %8, i64 2
store i8 46, ptr %55, align 1
%56 = getelementptr inbounds i8, ptr %8, i64 9
store i8 101, ptr %56, align 1
%57 = getelementptr inbounds i8, ptr %8, i64 10
store i8 43, ptr %57, align 1
%58 = icmp slt i64 %16, 0
br i1 %58, label %_llgo_28, label %_llgo_29
%56 = load i8, ptr %55, align 1
%57 = getelementptr inbounds i8, ptr %8, i64 1
store i8 %56, ptr %57, align 1
%58 = getelementptr inbounds i8, ptr %8, i64 2
store i8 46, ptr %58, align 1
%59 = getelementptr inbounds i8, ptr %8, i64 9
store i8 101, ptr %59, align 1
%60 = getelementptr inbounds i8, ptr %8, i64 10
store i8 43, ptr %60, align 1
%61 = icmp slt i64 %16, 0
br i1 %61, label %_llgo_28, label %_llgo_29
_llgo_27: ; preds = %_llgo_25, %_llgo_12
%59 = phi double [ %15, %_llgo_12 ], [ %50, %_llgo_25 ]
%60 = phi i64 [ 0, %_llgo_12 ], [ %51, %_llgo_25 ]
%61 = icmp slt i64 %60, 7
br i1 %61, label %_llgo_25, label %_llgo_26
_llgo_28: ; preds = %_llgo_26
_llgo_28: ; preds = %_llgo_27
%62 = sub i64 0, %16
%63 = getelementptr inbounds i8, ptr %8, i64 10
store i8 45, ptr %63, align 1
br label %_llgo_29
_llgo_29: ; preds = %_llgo_28, %_llgo_26
%64 = phi i64 [ %16, %_llgo_26 ], [ %62, %_llgo_28 ]
_llgo_29: ; preds = %_llgo_28, %_llgo_27
%64 = phi i64 [ %16, %_llgo_27 ], [ %62, %_llgo_28 ]
%65 = sdiv i64 %64, 100
%66 = trunc i64 %65 to i8
%67 = add i8 %66, 48

View File

@@ -49,30 +49,30 @@ _llgo_0:
store ptr %1, ptr @__llgo_argv, align 8
call void @"github.com/goplus/llgo/internal/runtime.init"()
call void @main.init()
br label %_llgo_3
br label %_llgo_1
_llgo_1: ; preds = %_llgo_3
%2 = call %"github.com/goplus/llgo/internal/runtime.String" @"github.com/goplus/llgo/internal/runtime.StringSlice"(%"github.com/goplus/llgo/internal/runtime.String" { ptr @0, i64 7 }, i64 %10, i64 7)
%3 = call { i32, i64 } @"unicode/utf8.DecodeRuneInString"(%"github.com/goplus/llgo/internal/runtime.String" %2)
%4 = extractvalue { i32, i64 } %3, 0
%5 = extractvalue { i32, i64 } %3, 1
%6 = add i64 %10, %5
%7 = sext i32 %4 to i64
call void @"github.com/goplus/llgo/internal/runtime.PrintInt"(i64 %7)
_llgo_1: ; preds = %_llgo_2, %_llgo_0
%2 = phi i64 [ 0, %_llgo_0 ], [ %8, %_llgo_2 ]
%3 = icmp slt i64 %2, 7
br i1 %3, label %_llgo_2, label %_llgo_3
_llgo_2: ; preds = %_llgo_1
%4 = call %"github.com/goplus/llgo/internal/runtime.String" @"github.com/goplus/llgo/internal/runtime.StringSlice"(%"github.com/goplus/llgo/internal/runtime.String" { ptr @0, i64 7 }, i64 %2, i64 7)
%5 = call { i32, i64 } @"unicode/utf8.DecodeRuneInString"(%"github.com/goplus/llgo/internal/runtime.String" %4)
%6 = extractvalue { i32, i64 } %5, 0
%7 = extractvalue { i32, i64 } %5, 1
%8 = add i64 %2, %7
%9 = sext i32 %6 to i64
call void @"github.com/goplus/llgo/internal/runtime.PrintInt"(i64 %9)
call void @"github.com/goplus/llgo/internal/runtime.PrintByte"(i8 10)
br label %_llgo_3
br label %_llgo_1
_llgo_2: ; preds = %_llgo_3
%8 = call i8 @main.index(i8 2)
%9 = icmp eq i8 %8, 3
call void @"github.com/goplus/llgo/internal/runtime.PrintBool"(i1 %9)
_llgo_3: ; preds = %_llgo_1
%10 = call i8 @main.index(i8 2)
%11 = icmp eq i8 %10, 3
call void @"github.com/goplus/llgo/internal/runtime.PrintBool"(i1 %11)
call void @"github.com/goplus/llgo/internal/runtime.PrintByte"(i8 10)
ret i32 0
_llgo_3: ; preds = %_llgo_1, %_llgo_0
%10 = phi i64 [ 0, %_llgo_0 ], [ %6, %_llgo_1 ]
%11 = icmp slt i64 %10, 7
br i1 %11, label %_llgo_1, label %_llgo_2
}
declare void @"github.com/goplus/llgo/internal/runtime.AssertIndexRange"(i1)

View File

@@ -1,7 +1,7 @@
0: always
6: cond
3: loop
1: loop
2: loop
4: loop
2: cond
3: cond
5: cond

View File

@@ -1,4 +1,4 @@
0: always
3: loop
1: loop
2: always
2: loop
3: always

View File

@@ -1,7 +1,7 @@
0: always
1: cond
4: loop
2: loop
3: loop
5: loop
3: cond
4: cond
6: cond

View File

@@ -8,11 +8,11 @@
10: loop
8: loop
9: cond
13: loop
11: loop
12: cond
12: loop
13: cond
14: cond
2: cond
17: loop
15: loop
16: always
16: loop
17: always

View File

@@ -16,24 +16,24 @@ _llgo_0:
define void @main.Test() {
_llgo_0:
br label %_llgo_3
br label %_llgo_1
_llgo_1: ; preds = %_llgo_3
%0 = call i64 @main.Foo(%"github.com/goplus/llgo/internal/runtime.String" { ptr @0, i64 5 })
%1 = add i64 %3, %0
%2 = add i64 %4, 1
br label %_llgo_3
_llgo_1: ; preds = %_llgo_2, %_llgo_0
%0 = phi i64 [ 0, %_llgo_0 ], [ %4, %_llgo_2 ]
%1 = phi i64 [ 0, %_llgo_0 ], [ %5, %_llgo_2 ]
%2 = icmp slt i64 %1, 10000000
br i1 %2, label %_llgo_2, label %_llgo_3
_llgo_2: ; preds = %_llgo_3
call void @"github.com/goplus/llgo/internal/runtime.PrintInt"(i64 %3)
_llgo_2: ; preds = %_llgo_1
%3 = call i64 @main.Foo(%"github.com/goplus/llgo/internal/runtime.String" { ptr @0, i64 5 })
%4 = add i64 %0, %3
%5 = add i64 %1, 1
br label %_llgo_1
_llgo_3: ; preds = %_llgo_1
call void @"github.com/goplus/llgo/internal/runtime.PrintInt"(i64 %0)
call void @"github.com/goplus/llgo/internal/runtime.PrintByte"(i8 10)
ret void
_llgo_3: ; preds = %_llgo_1, %_llgo_0
%3 = phi i64 [ 0, %_llgo_0 ], [ %1, %_llgo_1 ]
%4 = phi i64 [ 0, %_llgo_0 ], [ %2, %_llgo_1 ]
%5 = icmp slt i64 %4, 10000000
br i1 %5, label %_llgo_1, label %_llgo_2
}
define void @main.init() {

View File

@@ -98,7 +98,7 @@ _llgo_0:
declare void @runtime.cgoUse(%"github.com/goplus/llgo/internal/runtime.eface")
declare void @runtime.cgoCheckResult(%"github.com/goplus/llgo/internal/runtime.eface")
declare void @main._cgoCheckResult(%"github.com/goplus/llgo/internal/runtime.eface")
define void @main.init() {
_llgo_0:

View File

@@ -40,7 +40,7 @@ _llgo_0:
declare void @runtime.cgoUse(%"github.com/goplus/llgo/internal/runtime.eface")
declare void @runtime.cgoCheckResult(%"github.com/goplus/llgo/internal/runtime.eface")
declare void @main._cgoCheckResult(%"github.com/goplus/llgo/internal/runtime.eface")
define void @main.init() {
_llgo_0:

View File

@@ -90,7 +90,7 @@ _llgo_0:
%13 = call %"github.com/goplus/llgo/internal/runtime.iface" @reflect.Value.Type(%reflect.Value %11)
%14 = call ptr @"github.com/goplus/llgo/internal/runtime.IfacePtrData"(%"github.com/goplus/llgo/internal/runtime.iface" %13)
%15 = extractvalue %"github.com/goplus/llgo/internal/runtime.iface" %13, 0
%16 = getelementptr ptr, ptr %15, i64 31
%16 = getelementptr ptr, ptr %15, i64 37
%17 = load ptr, ptr %16, align 8
%18 = insertvalue { ptr, ptr } undef, ptr %17, 0
%19 = insertvalue { ptr, ptr } %18, ptr %14, 1
@@ -185,7 +185,7 @@ _llgo_0:
%6 = call %"github.com/goplus/llgo/internal/runtime.iface" @reflect.Value.Type(%reflect.Value %4)
%7 = call ptr @"github.com/goplus/llgo/internal/runtime.IfacePtrData"(%"github.com/goplus/llgo/internal/runtime.iface" %6)
%8 = extractvalue %"github.com/goplus/llgo/internal/runtime.iface" %6, 0
%9 = getelementptr ptr, ptr %8, i64 31
%9 = getelementptr ptr, ptr %8, i64 37
%10 = load ptr, ptr %9, align 8
%11 = insertvalue { ptr, ptr } undef, ptr %10, 0
%12 = insertvalue { ptr, ptr } %11, ptr %7, 1
@@ -286,7 +286,7 @@ _llgo_0:
%16 = call %"github.com/goplus/llgo/internal/runtime.iface" @reflect.Value.Type(%reflect.Value %14)
%17 = call ptr @"github.com/goplus/llgo/internal/runtime.IfacePtrData"(%"github.com/goplus/llgo/internal/runtime.iface" %16)
%18 = extractvalue %"github.com/goplus/llgo/internal/runtime.iface" %16, 0
%19 = getelementptr ptr, ptr %18, i64 31
%19 = getelementptr ptr, ptr %18, i64 37
%20 = load ptr, ptr %19, align 8
%21 = insertvalue { ptr, ptr } undef, ptr %20, 0
%22 = insertvalue { ptr, ptr } %21, ptr %17, 1
@@ -393,7 +393,7 @@ _llgo_0:
%8 = call %"github.com/goplus/llgo/internal/runtime.iface" @reflect.Value.Type(%reflect.Value %6)
%9 = call ptr @"github.com/goplus/llgo/internal/runtime.IfacePtrData"(%"github.com/goplus/llgo/internal/runtime.iface" %8)
%10 = extractvalue %"github.com/goplus/llgo/internal/runtime.iface" %8, 0
%11 = getelementptr ptr, ptr %10, i64 31
%11 = getelementptr ptr, ptr %10, i64 37
%12 = load ptr, ptr %11, align 8
%13 = insertvalue { ptr, ptr } undef, ptr %12, 0
%14 = insertvalue { ptr, ptr } %13, ptr %9, 1
@@ -827,7 +827,7 @@ _llgo_9: ; preds = %_llgo_8, %_llgo_7
%60 = call %"github.com/goplus/llgo/internal/runtime.iface" @reflect.Value.Type(%reflect.Value %11)
%61 = call ptr @"github.com/goplus/llgo/internal/runtime.IfacePtrData"(%"github.com/goplus/llgo/internal/runtime.iface" %60)
%62 = extractvalue %"github.com/goplus/llgo/internal/runtime.iface" %60, 0
%63 = getelementptr ptr, ptr %62, i64 18
%63 = getelementptr ptr, ptr %62, i64 20
%64 = load ptr, ptr %63, align 8
%65 = insertvalue { ptr, ptr } undef, ptr %64, 0
%66 = insertvalue { ptr, ptr } %65, ptr %61, 1
@@ -839,7 +839,7 @@ _llgo_9: ; preds = %_llgo_8, %_llgo_7
%72 = call %"github.com/goplus/llgo/internal/runtime.iface" @reflect.Value.Type(%reflect.Value %11)
%73 = call ptr @"github.com/goplus/llgo/internal/runtime.IfacePtrData"(%"github.com/goplus/llgo/internal/runtime.iface" %72)
%74 = extractvalue %"github.com/goplus/llgo/internal/runtime.iface" %72, 0
%75 = getelementptr ptr, ptr %74, i64 9
%75 = getelementptr ptr, ptr %74, i64 11
%76 = load ptr, ptr %75, align 8
%77 = insertvalue { ptr, ptr } undef, ptr %76, 0
%78 = insertvalue { ptr, ptr } %77, ptr %73, 1
@@ -1009,7 +1009,7 @@ _llgo_9: ; preds = %_llgo_8, %_llgo_7
%77 = call %"github.com/goplus/llgo/internal/runtime.iface" @reflect.Value.Type(%reflect.Value %10)
%78 = call ptr @"github.com/goplus/llgo/internal/runtime.IfacePtrData"(%"github.com/goplus/llgo/internal/runtime.iface" %77)
%79 = extractvalue %"github.com/goplus/llgo/internal/runtime.iface" %77, 0
%80 = getelementptr ptr, ptr %79, i64 18
%80 = getelementptr ptr, ptr %79, i64 20
%81 = load ptr, ptr %80, align 8
%82 = insertvalue { ptr, ptr } undef, ptr %81, 0
%83 = insertvalue { ptr, ptr } %82, ptr %78, 1
@@ -1021,7 +1021,7 @@ _llgo_9: ; preds = %_llgo_8, %_llgo_7
%89 = call %"github.com/goplus/llgo/internal/runtime.iface" @reflect.Value.Type(%reflect.Value %10)
%90 = call ptr @"github.com/goplus/llgo/internal/runtime.IfacePtrData"(%"github.com/goplus/llgo/internal/runtime.iface" %89)
%91 = extractvalue %"github.com/goplus/llgo/internal/runtime.iface" %89, 0
%92 = getelementptr ptr, ptr %91, i64 9
%92 = getelementptr ptr, ptr %91, i64 11
%93 = load ptr, ptr %92, align 8
%94 = insertvalue { ptr, ptr } undef, ptr %93, 0
%95 = insertvalue { ptr, ptr } %94, ptr %90, 1

View File

@@ -25,24 +25,24 @@ _llgo_0:
store ptr %1, ptr @__llgo_argv, align 8
call void @"github.com/goplus/llgo/internal/runtime.init"()
call void @main.init()
br label %_llgo_3
br label %_llgo_1
_llgo_1: ; preds = %_llgo_3
%2 = load ptr, ptr @__llgo_argv, align 8
%3 = getelementptr ptr, ptr %2, i32 %7
%4 = load ptr, ptr %3, align 8
%5 = call i32 (ptr, ...) @printf(ptr @0, ptr %4)
%6 = add i32 %7, 1
br label %_llgo_3
_llgo_1: ; preds = %_llgo_2, %_llgo_0
%2 = phi i32 [ 0, %_llgo_0 ], [ %9, %_llgo_2 ]
%3 = load i32, ptr @__llgo_argc, align 4
%4 = icmp slt i32 %2, %3
br i1 %4, label %_llgo_2, label %_llgo_3
_llgo_2: ; preds = %_llgo_3
_llgo_2: ; preds = %_llgo_1
%5 = load ptr, ptr @__llgo_argv, align 8
%6 = getelementptr ptr, ptr %5, i32 %2
%7 = load ptr, ptr %6, align 8
%8 = call i32 (ptr, ...) @printf(ptr @0, ptr %7)
%9 = add i32 %2, 1
br label %_llgo_1
_llgo_3: ; preds = %_llgo_1
ret i32 0
_llgo_3: ; preds = %_llgo_1, %_llgo_0
%7 = phi i32 [ 0, %_llgo_0 ], [ %6, %_llgo_1 ]
%8 = load i32, ptr @__llgo_argc, align 4
%9 = icmp slt i32 %7, %8
br i1 %9, label %_llgo_1, label %_llgo_2
}
declare void @"github.com/goplus/llgo/internal/runtime.init"()

View File

@@ -16,7 +16,7 @@ _llgo_0:
declare void @runtime.cgoUse(%"github.com/goplus/llgo/internal/runtime.eface")
declare void @runtime.cgoCheckResult(%"github.com/goplus/llgo/internal/runtime.eface")
declare void @main._cgoCheckResult(%"github.com/goplus/llgo/internal/runtime.eface")
define void @main.init() {
_llgo_0:

View File

@@ -43,7 +43,7 @@ _llgo_0:
declare void @runtime.cgoUse(%"github.com/goplus/llgo/internal/runtime.eface")
declare void @runtime.cgoCheckResult(%"github.com/goplus/llgo/internal/runtime.eface")
declare void @main._cgoCheckResult(%"github.com/goplus/llgo/internal/runtime.eface")
define void @main.init() {
_llgo_0:

View File

@@ -32,7 +32,7 @@ _llgo_0:
declare void @runtime.cgoUse(%"github.com/goplus/llgo/internal/runtime.eface")
declare void @runtime.cgoCheckResult(%"github.com/goplus/llgo/internal/runtime.eface")
declare void @main._cgoCheckResult(%"github.com/goplus/llgo/internal/runtime.eface")
define void @main.init() {
_llgo_0:

View File

@@ -636,7 +636,8 @@ func ignoreName(name string) bool {
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, "itoa.") || strings.HasPrefix(name, "oserror.") ||
strings.HasPrefix(name, "race.") || strings.HasPrefix(name, "reflectlite.") || strings.HasPrefix(name, "stringslite.") ||
strings.HasPrefix(name, "syscall/unix.") || strings.HasPrefix(name, "syscall/execenv.")
}

10
go.mod
View File

@@ -1,18 +1,20 @@
module github.com/goplus/llgo
go 1.20
go 1.22.0
toolchain go1.23.3
require (
github.com/goplus/gogen v1.16.4
github.com/goplus/llvm v0.8.1
github.com/goplus/mod v0.13.13
github.com/qiniu/x v1.13.10
golang.org/x/tools v0.19.0
golang.org/x/tools v0.28.0
)
require (
golang.org/x/mod v0.20.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/mod v0.22.0 // indirect
golang.org/x/sync v0.10.0 // indirect
)
retract v0.8.0

14
go.sum
View File

@@ -1,3 +1,5 @@
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/goplus/gogen v1.16.4 h1:RyU4KhJ8qmdJQwuHKpCYPh3hTFN4wSaPRwXa9syY4R8=
github.com/goplus/gogen v1.16.4/go.mod h1:6TQYbabXDF9LCdDkOOzHmfg1R4ENfXQ3XpHa9RhTSD8=
github.com/goplus/llvm v0.8.1 h1:Wrc9S8bKDhLjxjPuhnrgDYLRaFfKotOGt3zpId3LBmI=
@@ -6,9 +8,9 @@ github.com/goplus/mod v0.13.13 h1:rvwXCCQciTz4NjB3GLAZ2cskw035B64F7KzRAyMYUCw=
github.com/goplus/mod v0.13.13/go.mod h1:invR72Rz2+qpOOsXqxz830MX8/aR2GDR2EAow/WgfHI=
github.com/qiniu/x v1.13.10 h1:J4Z3XugYzAq85SlyAfqlKVrbf05glMbAOh+QncsDQpE=
github.com/qiniu/x v1.13.10/go.mod h1:INZ2TSWSJVWO/RuELQROERcslBwVgFG7MkTfEdaQz9E=
golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0=
golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw=
golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc=
golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8=
golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw=

View File

@@ -854,7 +854,9 @@ var hasAltPkg = map[string]none{
"internal/bytealg": {},
"internal/itoa": {},
"internal/oserror": {},
"internal/race": {},
"internal/reflectlite": {},
"internal/stringslite": {},
"internal/syscall/execenv": {},
"internal/syscall/unix": {},
"math": {},

View File

@@ -18,9 +18,14 @@ package abi
// llgo:skipall
import (
_ "unsafe"
"unsafe"
"github.com/goplus/llgo/internal/abi"
)
type InterfaceType = abi.InterfaceType
func NoEscape(p unsafe.Pointer) unsafe.Pointer {
x := uintptr(p)
return unsafe.Pointer(x ^ 0)
}

View File

@@ -16,7 +16,7 @@
package bytealg
// llgo:skip init
// llgo:skip init CompareString
import (
"unsafe"
@@ -123,3 +123,26 @@ func LastIndexByteString(s string, c byte) int {
}
return -1
}
func CompareString(a, b string) int {
l := len(a)
if len(b) < l {
l = len(b)
}
for i := 0; i < l; i++ {
c1, c2 := a[i], b[i]
if c1 < c2 {
return -1
}
if c1 > c2 {
return +1
}
}
if len(a) < len(b) {
return -1
}
if len(a) > len(b) {
return +1
}
return 0
}

View File

@@ -0,0 +1 @@
package race

View File

@@ -0,0 +1 @@
package stringslite

View File

@@ -0,0 +1 @@
package iter

View File

@@ -155,9 +155,6 @@ func loadFromExportData(ld *loader, lpkg *loaderPackage) error
//go:linkname parseFiles golang.org/x/tools/go/packages.(*loader).parseFiles
func parseFiles(ld *loader, filenames []string) ([]*ast.File, []error)
//go:linkname versionsInitFileVersions golang.org/x/tools/internal/versions.InitFileVersions
func versionsInitFileVersions(*types.Info)
//go:linkname typesinternalSetUsesCgo golang.org/x/tools/internal/typesinternal.SetUsesCgo
func typesinternalSetUsesCgo(conf *types.Config) bool
@@ -354,7 +351,6 @@ func loadPackageEx(dedup Deduper, ld *loader, lpkg *loaderPackage) {
Scopes: make(map[ast.Node]*types.Scope),
Selections: make(map[*ast.SelectorExpr]*types.Selection),
}
versionsInitFileVersions(lpkg.TypesInfo)
lpkg.TypesSizes = ld.sizes
importer := importerFunc(func(path string) (*types.Package, error) {

View File

@@ -1223,11 +1223,20 @@ func (b Builder) BuiltinCall(fn string, args ...Expr) (ret Expr) {
return
}
case "clear":
if len(args) == 1 && args[0].kind == vkMap {
m := args[0]
t := b.abiType(m.raw.Type)
b.Call(b.Pkg.rtFunc("MapClear"), t, m)
return
if len(args) == 1 {
arg := args[0]
switch arg.kind {
case vkMap:
m := arg
t := b.abiType(m.raw.Type)
b.Call(b.Pkg.rtFunc("MapClear"), t, m)
return
case vkSlice:
s := arg
t := b.abiType(s.raw.Type)
b.Call(b.Pkg.rtFunc("SliceClear"), t, s)
return
}
}
case "min":
if len(args) > 0 {
@@ -1239,6 +1248,8 @@ func (b Builder) BuiltinCall(fn string, args ...Expr) (ret Expr) {
}
case "Add":
return b.Advance(args[0], args[1])
case "Sizeof":
return b.Prog.Val(int(b.Prog.SizeOf(args[0].Type)))
}
panic("todo: " + fn)
}

View File

@@ -388,6 +388,8 @@ func (p Program) toType(raw types.Type) Type {
return &aType{llvm.ArrayType(elem.ll, int(t.Len())), typ, vkArray}
case *types.Chan:
return &aType{llvm.PointerType(p.rtChan(), 0), typ, vkChan}
case *types.TypeParam:
return p.toType(t.Underlying())
}
panic(fmt.Sprintf("toLLVMType: todo - %T\n", raw))
}

View File

@@ -113,6 +113,8 @@ func (p goTypes) cvtType(typ types.Type) (raw types.Type, cvt bool) {
}
case *types.Tuple:
return p.cvtTuple(t)
case *types.TypeParam:
return typ.Underlying(), false
default:
panic(fmt.Sprintf("cvtType: unexpected type - %T", typ))
}