llgo.string (llgo/ssa.MakeString) fix

goplus · Jun 19, 2024 · 4a1712f · 4a1712f
1 parent b4e2982
commit 4a1712f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/cl/_testlibc/once/in.go b/cl/_testlibc/once/in.go
@@ -14,6 +14,8 @@ func f() {
 }
 
 func main() {
+	println(c.GoString(c.Str("sync.Once demo\n"), 9))
+	println(c.GoString(c.Str("sync.Once demo\n")))
 	f()
 	f()
 }
diff --git a/cl/builtin_test.go b/cl/builtin_test.go
@@ -137,6 +137,7 @@ func TestErrBuiltin(t *testing.T) {
 	test("advance", func(ctx *context) { ctx.advance(nil, nil) })
 	test("alloca", func(ctx *context) { ctx.alloca(nil, nil) })
 	test("allocaCStr", func(ctx *context) { ctx.allocaCStr(nil, nil) })
+	test("string", func(ctx *context) { ctx.string(nil, nil) })
 	test("stringData", func(ctx *context) { ctx.stringData(nil, nil) })
 	test("sigsetjmp", func(ctx *context) { ctx.sigsetjmp(nil, nil) })
 	test("siglongjmp", func(ctx *context) { ctx.siglongjmp(nil, nil) })

diff --git a/ssa/datastruct.go b/ssa/datastruct.go
@@ -67,16 +67,20 @@ func (b Builder) getField(x Expr, idx int) Expr {
 // -----------------------------------------------------------------------------
 
 // MakeString creates a new string from a C string pointer and length.
-func (b Builder) MakeString(cstr Expr, n ...Expr) Expr {
+func (b Builder) MakeString(cstr Expr, n ...Expr) (ret Expr) {
 	if debugInstr {
 		log.Printf("MakeString %v\n", cstr.impl)
 	}
 	pkg := b.Pkg
+	prog := b.Prog
+	ret.Type = prog.String()
 	if len(n) == 0 {
-		return b.Call(pkg.rtFunc("StringFromCStr"), cstr)
+		ret.impl = b.Call(pkg.rtFunc("StringFromCStr"), cstr).impl
+	} else {
+		// TODO(xsw): remove Convert
+		ret.impl = b.Call(pkg.rtFunc("StringFrom"), cstr, b.Convert(prog.Int(), n[0])).impl
 	}
-	// TODO(xsw): remove Convert
-	return b.Call(pkg.rtFunc("StringFrom"), cstr, b.Convert(b.Prog.Int(), n[0]))
+	return
 }
 
 // StringData returns the data pointer of a string.