ci: fix compilation of ved after d3cb48a with -autofree

spytheman · spytheman · commit 93a136f3a573 · 2025-09-20T17:31:17.000+03:00
diff --git a/vlib/x/json2/encode.v b/vlib/x/json2/encode.v
@@ -342,21 +342,17 @@ fn check_not_empty[T](val T) ?bool {
 	return true
 }
 
-@[unsafe]
-fn (mut encoder Encoder) encode_struct[T](val T) {
-	encoder.output << `{`
-
+// TODO: fix compilation with -autofree, and remove the tag @[manualfree] here:
+@[manualfree; unsafe]
+fn (mut encoder Encoder) cached_field_infos[T]() []EncoderFieldInfo {
 	static field_infos := &[]EncoderFieldInfo(nil)
-
 	if field_infos == nil {
 		field_infos = &[]EncoderFieldInfo{}
-
 		$for field in T.fields {
 			mut is_skip := false
 			mut key_name := ''
 			mut is_omitempty := false
 			mut is_required := false
-
 			for attr in field.attrs {
 				match attr {
 					'skip' {
@@ -371,13 +367,11 @@ fn (mut encoder Encoder) encode_struct[T](val T) {
 					}
 					else {}
 				}
-
 				if attr.starts_with('json:') {
 					if attr == 'json: -' {
 						is_skip = true
 						break
 					}
-
 					key_name = attr[6..]
 				}
 			}
@@ -389,7 +383,13 @@ fn (mut encoder Encoder) encode_struct[T](val T) {
 			}
 		}
 	}
+	return *field_infos
+}
 
+@[unsafe]
+fn (mut encoder Encoder) encode_struct[T](val T) {
+	encoder.output << `{`
+	field_infos := encoder.cached_field_infos[T]()
 	mut i := 0
 	mut is_first := true
 	$for field in T.fields {
diff --git a/vlib/x/json2/tests/autofree_json_test.v b/vlib/x/json2/tests/autofree_json_test.v
@@ -0,0 +1,13 @@
+// vtest build: !sanitize-memory-gcc && !sanitize-address-gcc && !tests-sanitize-address-clang
+// vtest vflags: -autofree
+import x.json2
+
+struct Config {
+	bbb bool
+}
+
+fn test_compilation_with_autofree() {
+	cfg := Config{}
+	s := json2.encode(cfg, prettify: true)
+	assert s == '{\n    "bbb": false\n}'
+}

Original file line number	Diff line number	Diff line change
`@@ -342,21 +342,17 @@ fn check_not_empty[T](val T) ?bool {`
`342`	`342`	`return true`
`343`	`343`	`}`
`344`	`344`
`345`		`-@[unsafe]`
`346`		`-fn (mut encoder Encoder) encode_struct[T](val T) {`
`347`		- encoder.output << `{`
`348`		`-`
	`345`	`+// TODO: fix compilation with -autofree, and remove the tag @[manualfree] here:`
	`346`	`+@[manualfree; unsafe]`
	`347`	`+fn (mut encoder Encoder) cached_field_infos[T]() []EncoderFieldInfo {`
`349`	`348`	`static field_infos := &[]EncoderFieldInfo(nil)`
`350`		`-`
`351`	`349`	`if field_infos == nil {`
`352`	`350`	`field_infos = &[]EncoderFieldInfo{}`
`353`		`-`
`354`	`351`	`$for field in T.fields {`
`355`	`352`	`mut is_skip := false`
`356`	`353`	`mut key_name := ''`
`357`	`354`	`mut is_omitempty := false`
`358`	`355`	`mut is_required := false`
`359`		`-`
`360`	`356`	`for attr in field.attrs {`
`361`	`357`	`match attr {`
`362`	`358`	`'skip' {`
`@@ -371,13 +367,11 @@ fn (mut encoder Encoder) encode_struct[T](val T) {`
`371`	`367`	`}`
`372`	`368`	`else {}`
`373`	`369`	`}`
`374`		`-`
`375`	`370`	`if attr.starts_with('json:') {`
`376`	`371`	`if attr == 'json: -' {`
`377`	`372`	`is_skip = true`
`378`	`373`	`break`
`379`	`374`	`}`
`380`		`-`
`381`	`375`	`key_name = attr[6..]`
`382`	`376`	`}`
`383`	`377`	`}`
`@@ -389,7 +383,13 @@ fn (mut encoder Encoder) encode_struct[T](val T) {`
`389`	`383`	`}`
`390`	`384`	`}`
`391`	`385`	`}`
	`386`	`+ return *field_infos`
	`387`	`+}`
`392`	`388`
	`389`	`+@[unsafe]`
	`390`	`+fn (mut encoder Encoder) encode_struct[T](val T) {`
	`391`	+ encoder.output << `{`
	`392`	`+ field_infos := encoder.cached_field_infos[T]()`
`393`	`393`	`mut i := 0`
`394`	`394`	`mut is_first := true`
`395`	`395`	`$for field in T.fields {`