Skip to content

Commit 9203c36

Browse files
xushiweixushiwei
authored
Merge pull request #1121 from visualfc/closure
fix reflect.pointer for closure; fix runtime unsafe.pointer ptrBytes
2 parents 11a8af1 + cfc8687 commit 9203c36

File tree

4 files changed

+275
-4
lines changed

4 files changed

+275
-4
lines changed

‎cl/_testgo/reflectfn/in.go‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
package main
2+
3+
import (
4+
"fmt"
5+
"reflect"
6+
)
7+
8+
func demo() {
9+
println("demo")
10+
}
11+
12+
func main() {
13+
v := 100
14+
fn := func() {
15+
println(v)
16+
}
17+
fdemo := demo
18+
fmt.Println(fn)
19+
fmt.Println(demo)
20+
fmt.Println(fdemo)
21+
fmt.Println(reflect.ValueOf(fn).UnsafePointer())
22+
fmt.Println(reflect.ValueOf(demo).UnsafePointer())
23+
fmt.Println(reflect.ValueOf(fdemo).UnsafePointer())
24+
}

‎cl/_testgo/reflectfn/out.ll‎

Lines changed: 244 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,244 @@
1+
; ModuleID = 'github.com/goplus/llgo/cl/_testgo/reflectfn'
2+
source_filename = "github.com/goplus/llgo/cl/_testgo/reflectfn"
3+
4+
%"github.com/goplus/llgo/runtime/internal/runtime.String" = type { ptr, i64 }
5+
%"github.com/goplus/llgo/runtime/internal/runtime.eface" = type { ptr, ptr }
6+
%"github.com/goplus/llgo/runtime/internal/runtime.Slice" = type { ptr, i64, i64 }
7+
%"github.com/goplus/llgo/runtime/internal/runtime.iface" = type { ptr, ptr }
8+
%reflect.Value = type { ptr, ptr, i64 }
9+
%"github.com/goplus/llgo/runtime/abi.StructField" = type { %"github.com/goplus/llgo/runtime/internal/runtime.String", ptr, i64, %"github.com/goplus/llgo/runtime/internal/runtime.String", i1 }
10+
11+
@"github.com/goplus/llgo/cl/_testgo/reflectfn.init$guard" = global i1 false, align 1
12+
@0 = private unnamed_addr constant [4 x i8] c"demo", align 1
13+
@"_llgo_func$2_iS07vIlF2_rZqWB5eU0IvP_9HviM4MYZNkXZDvbac" = linkonce global ptr null, align 8
14+
@_llgo_Pointer = linkonce global ptr null, align 8
15+
@"github.com/goplus/llgo/cl/_testgo/reflectfn.struct$b7Su1hWaFih-M0M9hMk6nO_RD1K_GQu5WjIXQp6Q2e8" = linkonce global ptr null, align 8
16+
@1 = private unnamed_addr constant [2 x i8] c"$f", align 1
17+
@2 = private unnamed_addr constant [5 x i8] c"$data", align 1
18+
@3 = private unnamed_addr constant [43 x i8] c"github.com/goplus/llgo/cl/_testgo/reflectfn", align 1
19+
20+
define void @"github.com/goplus/llgo/cl/_testgo/reflectfn.demo"() {
21+
_llgo_0:
22+
call void @"github.com/goplus/llgo/runtime/internal/runtime.PrintString"(%"github.com/goplus/llgo/runtime/internal/runtime.String" { ptr @0, i64 4 })
23+
call void @"github.com/goplus/llgo/runtime/internal/runtime.PrintByte"(i8 10)
24+
ret void
25+
}
26+
27+
define void @"github.com/goplus/llgo/cl/_testgo/reflectfn.init"() {
28+
_llgo_0:
29+
%0 = load i1, ptr @"github.com/goplus/llgo/cl/_testgo/reflectfn.init$guard", align 1
30+
br i1 %0, label %_llgo_2, label %_llgo_1
31+
32+
_llgo_1: ; preds = %_llgo_0
33+
store i1 true, ptr @"github.com/goplus/llgo/cl/_testgo/reflectfn.init$guard", align 1
34+
call void @fmt.init()
35+
call void @reflect.init()
36+
call void @"github.com/goplus/llgo/cl/_testgo/reflectfn.init$after"()
37+
br label %_llgo_2
38+
39+
_llgo_2: ; preds = %_llgo_1, %_llgo_0
40+
ret void
41+
}
42+
43+
define void @"github.com/goplus/llgo/cl/_testgo/reflectfn.main"() {
44+
_llgo_0:
45+
%0 = call ptr @"github.com/goplus/llgo/runtime/internal/runtime.AllocZ"(i64 8)
46+
store i64 100, ptr %0, align 4
47+
%1 = call ptr @"github.com/goplus/llgo/runtime/internal/runtime.AllocU"(i64 8)
48+
%2 = getelementptr inbounds { ptr }, ptr %1, i32 0, i32 0
49+
store ptr %0, ptr %2, align 8
50+
%3 = insertvalue { ptr, ptr } { ptr @"github.com/goplus/llgo/cl/_testgo/reflectfn.main$1", ptr undef }, ptr %1, 1
51+
%4 = call ptr @"github.com/goplus/llgo/runtime/internal/runtime.AllocZ"(i64 16)
52+
%5 = getelementptr inbounds %"github.com/goplus/llgo/runtime/internal/runtime.eface", ptr %4, i64 0
53+
%6 = load ptr, ptr @"_llgo_func$2_iS07vIlF2_rZqWB5eU0IvP_9HviM4MYZNkXZDvbac", align 8
54+
%7 = load ptr, ptr @_llgo_Pointer, align 8
55+
%8 = load ptr, ptr @"github.com/goplus/llgo/cl/_testgo/reflectfn.struct$b7Su1hWaFih-M0M9hMk6nO_RD1K_GQu5WjIXQp6Q2e8", align 8
56+
%9 = call ptr @"github.com/goplus/llgo/runtime/internal/runtime.AllocU"(i64 16)
57+
store { ptr, ptr } %3, ptr %9, align 8
58+
%10 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.eface" undef, ptr %8, 0
59+
%11 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.eface" %10, ptr %9, 1
60+
store %"github.com/goplus/llgo/runtime/internal/runtime.eface" %11, ptr %5, align 8
61+
%12 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.Slice" undef, ptr %4, 0
62+
%13 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.Slice" %12, i64 1, 1
63+
%14 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.Slice" %13, i64 1, 2
64+
%15 = call { i64, %"github.com/goplus/llgo/runtime/internal/runtime.iface" } @fmt.Println(%"github.com/goplus/llgo/runtime/internal/runtime.Slice" %14)
65+
%16 = call ptr @"github.com/goplus/llgo/runtime/internal/runtime.AllocZ"(i64 16)
66+
%17 = getelementptr inbounds %"github.com/goplus/llgo/runtime/internal/runtime.eface", ptr %16, i64 0
67+
%18 = load ptr, ptr @"github.com/goplus/llgo/cl/_testgo/reflectfn.struct$b7Su1hWaFih-M0M9hMk6nO_RD1K_GQu5WjIXQp6Q2e8", align 8
68+
%19 = call ptr @"github.com/goplus/llgo/runtime/internal/runtime.AllocU"(i64 16)
69+
store { ptr, ptr } { ptr @"__llgo_stub.github.com/goplus/llgo/cl/_testgo/reflectfn.demo", ptr null }, ptr %19, align 8
70+
%20 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.eface" undef, ptr %18, 0
71+
%21 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.eface" %20, ptr %19, 1
72+
store %"github.com/goplus/llgo/runtime/internal/runtime.eface" %21, ptr %17, align 8
73+
%22 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.Slice" undef, ptr %16, 0
74+
%23 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.Slice" %22, i64 1, 1
75+
%24 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.Slice" %23, i64 1, 2
76+
%25 = call { i64, %"github.com/goplus/llgo/runtime/internal/runtime.iface" } @fmt.Println(%"github.com/goplus/llgo/runtime/internal/runtime.Slice" %24)
77+
%26 = call ptr @"github.com/goplus/llgo/runtime/internal/runtime.AllocZ"(i64 16)
78+
%27 = getelementptr inbounds %"github.com/goplus/llgo/runtime/internal/runtime.eface", ptr %26, i64 0
79+
%28 = load ptr, ptr @"github.com/goplus/llgo/cl/_testgo/reflectfn.struct$b7Su1hWaFih-M0M9hMk6nO_RD1K_GQu5WjIXQp6Q2e8", align 8
80+
%29 = call ptr @"github.com/goplus/llgo/runtime/internal/runtime.AllocU"(i64 16)
81+
store { ptr, ptr } { ptr @"__llgo_stub.github.com/goplus/llgo/cl/_testgo/reflectfn.demo", ptr null }, ptr %29, align 8
82+
%30 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.eface" undef, ptr %28, 0
83+
%31 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.eface" %30, ptr %29, 1
84+
store %"github.com/goplus/llgo/runtime/internal/runtime.eface" %31, ptr %27, align 8
85+
%32 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.Slice" undef, ptr %26, 0
86+
%33 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.Slice" %32, i64 1, 1
87+
%34 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.Slice" %33, i64 1, 2
88+
%35 = call { i64, %"github.com/goplus/llgo/runtime/internal/runtime.iface" } @fmt.Println(%"github.com/goplus/llgo/runtime/internal/runtime.Slice" %34)
89+
%36 = load ptr, ptr @"github.com/goplus/llgo/cl/_testgo/reflectfn.struct$b7Su1hWaFih-M0M9hMk6nO_RD1K_GQu5WjIXQp6Q2e8", align 8
90+
%37 = call ptr @"github.com/goplus/llgo/runtime/internal/runtime.AllocU"(i64 16)
91+
store { ptr, ptr } %3, ptr %37, align 8
92+
%38 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.eface" undef, ptr %36, 0
93+
%39 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.eface" %38, ptr %37, 1
94+
%40 = call %reflect.Value @reflect.ValueOf(%"github.com/goplus/llgo/runtime/internal/runtime.eface" %39)
95+
%41 = call ptr @reflect.Value.UnsafePointer(%reflect.Value %40)
96+
%42 = call ptr @"github.com/goplus/llgo/runtime/internal/runtime.AllocZ"(i64 16)
97+
%43 = getelementptr inbounds %"github.com/goplus/llgo/runtime/internal/runtime.eface", ptr %42, i64 0
98+
%44 = load ptr, ptr @_llgo_Pointer, align 8
99+
%45 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.eface" undef, ptr %44, 0
100+
%46 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.eface" %45, ptr %41, 1
101+
store %"github.com/goplus/llgo/runtime/internal/runtime.eface" %46, ptr %43, align 8
102+
%47 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.Slice" undef, ptr %42, 0
103+
%48 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.Slice" %47, i64 1, 1
104+
%49 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.Slice" %48, i64 1, 2
105+
%50 = call { i64, %"github.com/goplus/llgo/runtime/internal/runtime.iface" } @fmt.Println(%"github.com/goplus/llgo/runtime/internal/runtime.Slice" %49)
106+
%51 = load ptr, ptr @"github.com/goplus/llgo/cl/_testgo/reflectfn.struct$b7Su1hWaFih-M0M9hMk6nO_RD1K_GQu5WjIXQp6Q2e8", align 8
107+
%52 = call ptr @"github.com/goplus/llgo/runtime/internal/runtime.AllocU"(i64 16)
108+
store { ptr, ptr } { ptr @"__llgo_stub.github.com/goplus/llgo/cl/_testgo/reflectfn.demo", ptr null }, ptr %52, align 8
109+
%53 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.eface" undef, ptr %51, 0
110+
%54 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.eface" %53, ptr %52, 1
111+
%55 = call %reflect.Value @reflect.ValueOf(%"github.com/goplus/llgo/runtime/internal/runtime.eface" %54)
112+
%56 = call ptr @reflect.Value.UnsafePointer(%reflect.Value %55)
113+
%57 = call ptr @"github.com/goplus/llgo/runtime/internal/runtime.AllocZ"(i64 16)
114+
%58 = getelementptr inbounds %"github.com/goplus/llgo/runtime/internal/runtime.eface", ptr %57, i64 0
115+
%59 = load ptr, ptr @_llgo_Pointer, align 8
116+
%60 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.eface" undef, ptr %59, 0
117+
%61 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.eface" %60, ptr %56, 1
118+
store %"github.com/goplus/llgo/runtime/internal/runtime.eface" %61, ptr %58, align 8
119+
%62 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.Slice" undef, ptr %57, 0
120+
%63 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.Slice" %62, i64 1, 1
121+
%64 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.Slice" %63, i64 1, 2
122+
%65 = call { i64, %"github.com/goplus/llgo/runtime/internal/runtime.iface" } @fmt.Println(%"github.com/goplus/llgo/runtime/internal/runtime.Slice" %64)
123+
%66 = load ptr, ptr @"github.com/goplus/llgo/cl/_testgo/reflectfn.struct$b7Su1hWaFih-M0M9hMk6nO_RD1K_GQu5WjIXQp6Q2e8", align 8
124+
%67 = call ptr @"github.com/goplus/llgo/runtime/internal/runtime.AllocU"(i64 16)
125+
store { ptr, ptr } { ptr @"__llgo_stub.github.com/goplus/llgo/cl/_testgo/reflectfn.demo", ptr null }, ptr %67, align 8
126+
%68 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.eface" undef, ptr %66, 0
127+
%69 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.eface" %68, ptr %67, 1
128+
%70 = call %reflect.Value @reflect.ValueOf(%"github.com/goplus/llgo/runtime/internal/runtime.eface" %69)
129+
%71 = call ptr @reflect.Value.UnsafePointer(%reflect.Value %70)
130+
%72 = call ptr @"github.com/goplus/llgo/runtime/internal/runtime.AllocZ"(i64 16)
131+
%73 = getelementptr inbounds %"github.com/goplus/llgo/runtime/internal/runtime.eface", ptr %72, i64 0
132+
%74 = load ptr, ptr @_llgo_Pointer, align 8
133+
%75 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.eface" undef, ptr %74, 0
134+
%76 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.eface" %75, ptr %71, 1
135+
store %"github.com/goplus/llgo/runtime/internal/runtime.eface" %76, ptr %73, align 8
136+
%77 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.Slice" undef, ptr %72, 0
137+
%78 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.Slice" %77, i64 1, 1
138+
%79 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.Slice" %78, i64 1, 2
139+
%80 = call { i64, %"github.com/goplus/llgo/runtime/internal/runtime.iface" } @fmt.Println(%"github.com/goplus/llgo/runtime/internal/runtime.Slice" %79)
140+
ret void
141+
}
142+
143+
define void @"github.com/goplus/llgo/cl/_testgo/reflectfn.main$1"(ptr %0) {
144+
_llgo_0:
145+
%1 = load { ptr }, ptr %0, align 8
146+
%2 = extractvalue { ptr } %1, 0
147+
%3 = load i64, ptr %2, align 4
148+
call void @"github.com/goplus/llgo/runtime/internal/runtime.PrintInt"(i64 %3)
149+
call void @"github.com/goplus/llgo/runtime/internal/runtime.PrintByte"(i8 10)
150+
ret void
151+
}
152+
153+
declare void @"github.com/goplus/llgo/runtime/internal/runtime.PrintString"(%"github.com/goplus/llgo/runtime/internal/runtime.String")
154+
155+
declare void @"github.com/goplus/llgo/runtime/internal/runtime.PrintByte"(i8)
156+
157+
declare void @fmt.init()
158+
159+
declare void @reflect.init()
160+
161+
declare ptr @"github.com/goplus/llgo/runtime/internal/runtime.AllocZ"(i64)
162+
163+
declare ptr @"github.com/goplus/llgo/runtime/internal/runtime.AllocU"(i64)
164+
165+
define void @"github.com/goplus/llgo/cl/_testgo/reflectfn.init$after"() {
166+
_llgo_0:
167+
%0 = load ptr, ptr @"_llgo_func$2_iS07vIlF2_rZqWB5eU0IvP_9HviM4MYZNkXZDvbac", align 8
168+
%1 = icmp eq ptr %0, null
169+
br i1 %1, label %_llgo_1, label %_llgo_2
170+
171+
_llgo_1: ; preds = %_llgo_0
172+
%2 = call ptr @"github.com/goplus/llgo/runtime/internal/runtime.AllocU"(i64 0)
173+
%3 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.Slice" undef, ptr %2, 0
174+
%4 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.Slice" %3, i64 0, 1
175+
%5 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.Slice" %4, i64 0, 2
176+
%6 = call ptr @"github.com/goplus/llgo/runtime/internal/runtime.AllocU"(i64 0)
177+
%7 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.Slice" undef, ptr %6, 0
178+
%8 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.Slice" %7, i64 0, 1
179+
%9 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.Slice" %8, i64 0, 2
180+
%10 = call ptr @"github.com/goplus/llgo/runtime/internal/runtime.Func"(%"github.com/goplus/llgo/runtime/internal/runtime.Slice" %5, %"github.com/goplus/llgo/runtime/internal/runtime.Slice" %9, i1 false)
181+
call void @"github.com/goplus/llgo/runtime/internal/runtime.SetDirectIface"(ptr %10)
182+
store ptr %10, ptr @"_llgo_func$2_iS07vIlF2_rZqWB5eU0IvP_9HviM4MYZNkXZDvbac", align 8
183+
br label %_llgo_2
184+
185+
_llgo_2: ; preds = %_llgo_1, %_llgo_0
186+
%11 = load ptr, ptr @_llgo_Pointer, align 8
187+
%12 = icmp eq ptr %11, null
188+
br i1 %12, label %_llgo_3, label %_llgo_4
189+
190+
_llgo_3: ; preds = %_llgo_2
191+
%13 = call ptr @"github.com/goplus/llgo/runtime/internal/runtime.Basic"(i64 58)
192+
call void @"github.com/goplus/llgo/runtime/internal/runtime.SetDirectIface"(ptr %13)
193+
store ptr %13, ptr @_llgo_Pointer, align 8
194+
br label %_llgo_4
195+
196+
_llgo_4: ; preds = %_llgo_3, %_llgo_2
197+
%14 = call ptr @"github.com/goplus/llgo/runtime/internal/runtime.AllocU"(i64 0)
198+
%15 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.Slice" undef, ptr %14, 0
199+
%16 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.Slice" %15, i64 0, 1
200+
%17 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.Slice" %16, i64 0, 2
201+
%18 = call ptr @"github.com/goplus/llgo/runtime/internal/runtime.AllocU"(i64 0)
202+
%19 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.Slice" undef, ptr %18, 0
203+
%20 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.Slice" %19, i64 0, 1
204+
%21 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.Slice" %20, i64 0, 2
205+
%22 = call ptr @"github.com/goplus/llgo/runtime/internal/runtime.Func"(%"github.com/goplus/llgo/runtime/internal/runtime.Slice" %17, %"github.com/goplus/llgo/runtime/internal/runtime.Slice" %21, i1 false)
206+
%23 = call %"github.com/goplus/llgo/runtime/abi.StructField" @"github.com/goplus/llgo/runtime/internal/runtime.StructField"(%"github.com/goplus/llgo/runtime/internal/runtime.String" { ptr @1, i64 2 }, ptr %22, i64 0, %"github.com/goplus/llgo/runtime/internal/runtime.String" zeroinitializer, i1 false)
207+
%24 = call ptr @"github.com/goplus/llgo/runtime/internal/runtime.Basic"(i64 58)
208+
%25 = call %"github.com/goplus/llgo/runtime/abi.StructField" @"github.com/goplus/llgo/runtime/internal/runtime.StructField"(%"github.com/goplus/llgo/runtime/internal/runtime.String" { ptr @2, i64 5 }, ptr %24, i64 8, %"github.com/goplus/llgo/runtime/internal/runtime.String" zeroinitializer, i1 false)
209+
%26 = call ptr @"github.com/goplus/llgo/runtime/internal/runtime.AllocU"(i64 112)
210+
%27 = getelementptr %"github.com/goplus/llgo/runtime/abi.StructField", ptr %26, i64 0
211+
store %"github.com/goplus/llgo/runtime/abi.StructField" %23, ptr %27, align 8
212+
%28 = getelementptr %"github.com/goplus/llgo/runtime/abi.StructField", ptr %26, i64 1
213+
store %"github.com/goplus/llgo/runtime/abi.StructField" %25, ptr %28, align 8
214+
%29 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.Slice" undef, ptr %26, 0
215+
%30 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.Slice" %29, i64 2, 1
216+
%31 = insertvalue %"github.com/goplus/llgo/runtime/internal/runtime.Slice" %30, i64 2, 2
217+
%32 = call ptr @"github.com/goplus/llgo/runtime/internal/runtime.Struct"(%"github.com/goplus/llgo/runtime/internal/runtime.String" { ptr @3, i64 43 }, i64 16, %"github.com/goplus/llgo/runtime/internal/runtime.Slice" %31)
218+
store ptr %32, ptr @"github.com/goplus/llgo/cl/_testgo/reflectfn.struct$b7Su1hWaFih-M0M9hMk6nO_RD1K_GQu5WjIXQp6Q2e8", align 8
219+
ret void
220+
}
221+
222+
declare ptr @"github.com/goplus/llgo/runtime/internal/runtime.Func"(%"github.com/goplus/llgo/runtime/internal/runtime.Slice", %"github.com/goplus/llgo/runtime/internal/runtime.Slice", i1)
223+
224+
declare void @"github.com/goplus/llgo/runtime/internal/runtime.SetDirectIface"(ptr)
225+
226+
declare ptr @"github.com/goplus/llgo/runtime/internal/runtime.Basic"(i64)
227+
228+
declare ptr @"github.com/goplus/llgo/runtime/internal/runtime.Struct"(%"github.com/goplus/llgo/runtime/internal/runtime.String", i64, %"github.com/goplus/llgo/runtime/internal/runtime.Slice")
229+
230+
declare %"github.com/goplus/llgo/runtime/abi.StructField" @"github.com/goplus/llgo/runtime/internal/runtime.StructField"(%"github.com/goplus/llgo/runtime/internal/runtime.String", ptr, i64, %"github.com/goplus/llgo/runtime/internal/runtime.String", i1)
231+
232+
declare { i64, %"github.com/goplus/llgo/runtime/internal/runtime.iface" } @fmt.Println(%"github.com/goplus/llgo/runtime/internal/runtime.Slice")
233+
234+
define linkonce void @"__llgo_stub.github.com/goplus/llgo/cl/_testgo/reflectfn.demo"(ptr %0) {
235+
_llgo_0:
236+
tail call void @"github.com/goplus/llgo/cl/_testgo/reflectfn.demo"()
237+
ret void
238+
}
239+
240+
declare %reflect.Value @reflect.ValueOf(%"github.com/goplus/llgo/runtime/internal/runtime.eface")
241+
242+
declare ptr @reflect.Value.UnsafePointer(%reflect.Value)
243+
244+
declare void @"github.com/goplus/llgo/runtime/internal/runtime.PrintInt"(i64)

‎runtime/internal/lib/reflect/value.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,9 @@ func (v Value) typ() *abi.Type {
124124
// v.Kind() must be Pointer, Map, Chan, Func, or UnsafePointer
125125
// if v.Kind() == Pointer, the base type must not be not-in-heap.
126126
func (v Value) pointer() unsafe.Pointer {
127+
if v.typ_.IsClosure() {
128+
return v.ptr
129+
}
127130
if v.typ().Size() != goarch.PtrSize || !v.typ().Pointers() {
128131
panic("can't call pointer on a non-pointer Value")
129132
}

‎runtime/internal/runtime/z_type.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,13 @@ func Basic(_kind Kind) *Type {
7272
kind := _kind & abi.KindMask
7373
if tyBasic[kind] == nil {
7474
name, size, align := basicTypeInfo(kind)
75-
var bytes uintptr
76-
if kind == abi.String {
77-
bytes = pointerSize
75+
var ptrBytes uintptr
76+
if kind == abi.String || kind == abi.UnsafePointer {
77+
ptrBytes = pointerSize
7878
}
7979
tyBasic[kind] = &Type{
8080
Size_: size,
81-
PtrBytes: bytes,
81+
PtrBytes: ptrBytes,
8282
Hash: uint32(kind),
8383
Align_: uint8(align),
8484
FieldAlign_: uint8(align),

0 commit comments

Comments
 (0)