builtin: reduce a bit the generated #if defined checks for small programs (#23484)

spytheman · web-flow · commit 12d8f173a412 · 2025-01-16T17:16:09.000+02:00
diff --git a/vlib/builtin/builtin.c.v b/vlib/builtin/builtin.c.v
@@ -346,21 +346,19 @@ pub fn println(s string) {
 
 @[manualfree]
 fn _writeln_to_fd(fd int, s string) {
-	$if !builtin_writeln_should_write_at_once ? {
+	$if builtin_writeln_should_write_at_once ? {
+		unsafe {
+			buf_len := s.len + 1 // space for \n
+			mut buf := malloc(buf_len)
+			C.memcpy(buf, s.str, s.len)
+			buf[s.len] = `\n`
+			_write_buf_to_fd(fd, buf, buf_len)
+			free(buf)
+		}
+	} $else {
 		lf := u8(`\n`)
 		_write_buf_to_fd(fd, s.str, s.len)
 		_write_buf_to_fd(fd, &lf, 1)
-		return
-	}
-	unsafe {
-		buf_len := s.len + 1 // space for \n
-		mut buf := malloc(buf_len)
-		defer {
-			free(buf)
-		}
-		C.memcpy(buf, s.str, s.len)
-		buf[s.len] = `\n`
-		_write_buf_to_fd(fd, buf, buf_len)
 	}
 }
 
diff --git a/vlib/builtin/utf8.c.v b/vlib/builtin/utf8.c.v
@@ -82,14 +82,12 @@ pub fn string_from_wide2(_wstr &u16, len int) string {
 		}
 	} $else {
 		mut sb := strings.new_builder(len)
-		defer {
-			unsafe { sb.free() }
-		}
 		for i := 0; i < len; i++ {
 			u := unsafe { rune(_wstr[i]) }
 			sb.write_rune(u)
 		}
 		res := sb.str()
+		unsafe { sb.free() }
 		return res
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -82,14 +82,12 @@ pub fn string_from_wide2(_wstr &u16, len int) string {`
`82`	`82`	`}`
`83`	`83`	`} $else {`
`84`	`84`	`mut sb := strings.new_builder(len)`
`85`		`- defer {`
`86`		`- unsafe { sb.free() }`
`87`		`- }`
`88`	`85`	`for i := 0; i < len; i++ {`
`89`	`86`	`u := unsafe { rune(_wstr[i]) }`
`90`	`87`	`sb.write_rune(u)`
`91`	`88`	`}`
`92`	`89`	`res := sb.str()`
	`90`	`+ unsafe { sb.free() }`
`93`	`91`	`return res`
`94`	`92`	`}`
`95`	`93`	`}`