Merge pull request #895 from xushiwei/q

TestGoTypeInstr
goplus · Nov 15, 2021 · 777da05 · 777da05
2 parents f7ac2c9 + 682bc77
commit 777da05
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 5 deletions.
diff --git a/cl/compile.go b/cl/compile.go
@@ -636,6 +636,11 @@ func preloadFile(p *gox.Package, parent *pkgCtx, file string, f *ast.File, targe
 							log.Println("==> Load > NewType", name)
 						}
 						decl := ctx.pkg.NewType(name)
+						if t.Doc != nil {
+							decl.SetComments(t.Doc)
+						} else if d.Doc != nil {
+							decl.SetComments(d.Doc)
+						}
 						ld.typInit = func() { // decycle
 							if debugLoad {
 								log.Println("==> Load > InitType", name)

diff --git a/cl/compile_test.go b/cl/compile_test.go
@@ -3212,7 +3212,7 @@ func main() {
 `)
 }
 
-func TestGoInstr(t *testing.T) {
+func TestGoFuncInstr(t *testing.T) {
 	gopClTest(t, `package main
 
 //go:noinline
@@ -3225,3 +3225,16 @@ func test(s string, p uintptr, q uintptr, rest ...uintptr) int {
 }
 `)
 }
+
+func TestGoTypeInstr(t *testing.T) {
+	gopClTest(t, `package main
+
+//go:notinheap
+type S struct{ x int }
+`, `package main
+//go:notinheap
+type S struct {
+	x int
+}
+`)
+}
diff --git a/cmd/goptestgo/goptestgo.go b/cmd/goptestgo/goptestgo.go
@@ -64,7 +64,6 @@ var (
 		"issue18149.go":     {},
 		"issue22662.go":     {},
 		"issue27201.go":     {},
-		"issue40954.go":     {}, // type instruction
 		"nilptr_aix.go":     {},
 		"inline_literal.go": {},
 		"returntype.go":     {}, // not a problem

diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/goplus/gop
 go 1.16
 
 require (
-	github.com/goplus/gox v1.7.14
+	github.com/goplus/gox v1.7.15
 	github.com/qiniu/x v1.11.5
 	golang.org/x/mod v0.5.1
 	golang.org/x/tools v0.1.7

diff --git a/go.sum b/go.sum
@@ -1,5 +1,5 @@
-github.com/goplus/gox v1.7.14 h1:Y1SRmPm+Xlv8DZkf7Q0d9umvVtGcC6m0K6w8GvSC+Kg=
-github.com/goplus/gox v1.7.14/go.mod h1:orZ6Mr9qqB4BVaVCMp/cypMtkn0Fp5XUE7e5uqjZATA=
+github.com/goplus/gox v1.7.15 h1:su5OVmfKPTj4kXrATMBB2n2zuIYoPPR2pDv6k9/Qt3A=
+github.com/goplus/gox v1.7.15/go.mod h1:orZ6Mr9qqB4BVaVCMp/cypMtkn0Fp5XUE7e5uqjZATA=
 github.com/qiniu/x v1.11.5 h1:TYr5cl4g2yoHAZeDK4MTjKF6CMoG+IHlCDvvM5qym6U=
 github.com/qiniu/x v1.11.5/go.mod h1:03Ni9tj+N2h2aKnAz+6N0Xfl8FwMEDRC2PAlxekASDs=
 github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=