From eab148eaa529f32cc9c9b15865781ab0d9096896 Mon Sep 17 00:00:00 2001
From: Felipe Pena <felipensp@gmail.com>
Date: Sun, 16 Feb 2025 12:04:20 -0300
Subject: [PATCH] cgen: fix map with an Enum as key type, with size < 4 bytes
 on tcc (fix #23714) (#23738)

---
 vlib/v/gen/c/cgen.v             |  5 +++++
 vlib/v/tests/enum_packed_test.v | 19 +++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 vlib/v/tests/enum_packed_test.v

diff --git a/vlib/v/gen/c/cgen.v b/vlib/v/gen/c/cgen.v
index a8a849f1e..41206fa1d 100644
--- a/vlib/v/gen/c/cgen.v
+++ b/vlib/v/gen/c/cgen.v
@@ -3396,6 +3396,11 @@ fn (mut g Gen) map_fn_ptrs(key_sym ast.TypeSymbol) (string, string, string, stri
 		}
 		.enum {
 			einfo := (key_sym.info) as ast.Enum
+			if g.pref.ccompiler_type == .tinyc
+				&& einfo.typ in [ast.u8_type, ast.u16_type, ast.i8_type, ast.i16_type] {
+				// workaround for tcc, since we can not generate a packed Enum with size < 4 bytes
+				return g.map_fn_ptrs(g.table.sym(ast.int_type))
+			}
 			return g.map_fn_ptrs(g.table.sym(einfo.typ))
 		}
 		.int, .i32, .u32, .rune, .f32 {
diff --git a/vlib/v/tests/enum_packed_test.v b/vlib/v/tests/enum_packed_test.v
new file mode 100644
index 000000000..bd7da3ad2
--- /dev/null
+++ b/vlib/v/tests/enum_packed_test.v
@@ -0,0 +1,19 @@
+module main
+
+import flag
+import os
+
+pub enum Number as u8 {
+	zero = 0
+	one  = 1
+	six  = 6
+}
+
+fn test_main() {
+	mut fp := flag.new_flag_parser(os.args)
+	_ := fp.finalize()!
+	mut numbers := map[Number]string{}
+	numbers[.zero] = '0'
+	numbers[.one] = '1'
+	assert numbers.str() == "{zero: '0', one: '1'}"
+}
-- 
2.39.5