wasm2c: Remove enum types from variadic get_func_type API

shravanrn · shravanrn · commit 879af11ce11f · 2025-04-24T14:40:22.000-05:00
diff --git a/src/c-writer.cc b/src/c-writer.cc
@@ -2807,10 +2807,10 @@ void CWriter::WriteGetFuncType() {
     Write("va_start(args, result_count);", Newline());
     Write("if (true");
     for (const auto& t : signature.param_types) {
-      Write(" && va_arg(args, wasm_rt_type_t) == ", TypeEnum(t));
+      Write(" && va_arg(args, int) == ", TypeEnum(t));
     }
     for (const auto& t : signature.result_types) {
-      Write(" && va_arg(args, wasm_rt_type_t) == ", TypeEnum(t));
+      Write(" && va_arg(args, int) == ", TypeEnum(t));
     }
     Write(") ", OpenBrace());
     Write("va_end(args);", Newline());
diff --git a/test/wasm2c/add.txt b/test/wasm2c/add.txt
@@ -821,7 +821,7 @@ wasm_rt_func_type_t wasm2c_test_get_func_type(uint32_t param_count, uint32_t res
   
   if (param_count == 2 && result_count == 1) {
     va_start(args, result_count);
-    if (true && va_arg(args, wasm_rt_type_t) == WASM_RT_I32 && va_arg(args, wasm_rt_type_t) == WASM_RT_I32 && va_arg(args, wasm_rt_type_t) == WASM_RT_I32) {
+    if (true && va_arg(args, int) == WASM_RT_I32 && va_arg(args, int) == WASM_RT_I32 && va_arg(args, int) == WASM_RT_I32) {
       va_end(args);
       return w2c_test_t0;
     }
diff --git a/test/wasm2c/check-imports.txt b/test/wasm2c/check-imports.txt
@@ -887,7 +887,7 @@ wasm_rt_func_type_t wasm2c_test_get_func_type(uint32_t param_count, uint32_t res
   
   if (param_count == 1 && result_count == 1) {
     va_start(args, result_count);
-    if (true && va_arg(args, wasm_rt_type_t) == WASM_RT_I32 && va_arg(args, wasm_rt_type_t) == WASM_RT_I32) {
+    if (true && va_arg(args, int) == WASM_RT_I32 && va_arg(args, int) == WASM_RT_I32) {
       va_end(args);
       return w2c_test_t0;
     }
@@ -896,7 +896,7 @@ wasm_rt_func_type_t wasm2c_test_get_func_type(uint32_t param_count, uint32_t res
   
   if (param_count == 0 && result_count == 1) {
     va_start(args, result_count);
-    if (true && va_arg(args, wasm_rt_type_t) == WASM_RT_I32) {
+    if (true && va_arg(args, int) == WASM_RT_I32) {
       va_end(args);
       return w2c_test_t1;
     }
@@ -905,7 +905,7 @@ wasm_rt_func_type_t wasm2c_test_get_func_type(uint32_t param_count, uint32_t res
   
   if (param_count == 2 && result_count == 1) {
     va_start(args, result_count);
-    if (true && va_arg(args, wasm_rt_type_t) == WASM_RT_I32 && va_arg(args, wasm_rt_type_t) == WASM_RT_I32 && va_arg(args, wasm_rt_type_t) == WASM_RT_I32) {
+    if (true && va_arg(args, int) == WASM_RT_I32 && va_arg(args, int) == WASM_RT_I32 && va_arg(args, int) == WASM_RT_I32) {
       va_end(args);
       return w2c_test_t2;
     }
diff --git a/test/wasm2c/hello.txt b/test/wasm2c/hello.txt
@@ -917,7 +917,7 @@ wasm_rt_func_type_t wasm2c_test_get_func_type(uint32_t param_count, uint32_t res
   
   if (param_count == 4 && result_count == 1) {
     va_start(args, result_count);
-    if (true && va_arg(args, wasm_rt_type_t) == WASM_RT_I32 && va_arg(args, wasm_rt_type_t) == WASM_RT_I32 && va_arg(args, wasm_rt_type_t) == WASM_RT_I32 && va_arg(args, wasm_rt_type_t) == WASM_RT_I32 && va_arg(args, wasm_rt_type_t) == WASM_RT_I32) {
+    if (true && va_arg(args, int) == WASM_RT_I32 && va_arg(args, int) == WASM_RT_I32 && va_arg(args, int) == WASM_RT_I32 && va_arg(args, int) == WASM_RT_I32 && va_arg(args, int) == WASM_RT_I32) {
       va_end(args);
       return w2c_test_t0;
     }
@@ -926,7 +926,7 @@ wasm_rt_func_type_t wasm2c_test_get_func_type(uint32_t param_count, uint32_t res
   
   if (param_count == 1 && result_count == 0) {
     va_start(args, result_count);
-    if (true && va_arg(args, wasm_rt_type_t) == WASM_RT_I32) {
+    if (true && va_arg(args, int) == WASM_RT_I32) {
       va_end(args);
       return w2c_test_t1;
     }
diff --git a/test/wasm2c/tail-calls.txt b/test/wasm2c/tail-calls.txt
@@ -895,7 +895,7 @@ wasm_rt_func_type_t wasm2c_test_get_func_type(uint32_t param_count, uint32_t res
   
   if (param_count == 2 && result_count == 0) {
     va_start(args, result_count);
-    if (true && va_arg(args, wasm_rt_type_t) == WASM_RT_I32 && va_arg(args, wasm_rt_type_t) == WASM_RT_F32) {
+    if (true && va_arg(args, int) == WASM_RT_I32 && va_arg(args, int) == WASM_RT_F32) {
       va_end(args);
       return w2c_test_i32_f32;
     }
@@ -913,7 +913,7 @@ wasm_rt_func_type_t wasm2c_test_get_func_type(uint32_t param_count, uint32_t res
   
   if (param_count == 2 && result_count == 2) {
     va_start(args, result_count);
-    if (true && va_arg(args, wasm_rt_type_t) == WASM_RT_I32 && va_arg(args, wasm_rt_type_t) == WASM_RT_F64 && va_arg(args, wasm_rt_type_t) == WASM_RT_I32 && va_arg(args, wasm_rt_type_t) == WASM_RT_F64) {
+    if (true && va_arg(args, int) == WASM_RT_I32 && va_arg(args, int) == WASM_RT_F64 && va_arg(args, int) == WASM_RT_I32 && va_arg(args, int) == WASM_RT_F64) {
       va_end(args);
       return w2c_test_t2;
     }

Original file line number	Diff line number	Diff line change
`@@ -2807,10 +2807,10 @@ void CWriter::WriteGetFuncType() {`
`2807`	`2807`	`Write("va_start(args, result_count);", Newline());`
`2808`	`2808`	`Write("if (true");`
`2809`	`2809`	`for (const auto& t : signature.param_types) {`
`2810`		`- Write(" && va_arg(args, wasm_rt_type_t) == ", TypeEnum(t));`
	`2810`	`+ Write(" && va_arg(args, int) == ", TypeEnum(t));`
`2811`	`2811`	`}`
`2812`	`2812`	`for (const auto& t : signature.result_types) {`
`2813`		`- Write(" && va_arg(args, wasm_rt_type_t) == ", TypeEnum(t));`
	`2813`	`+ Write(" && va_arg(args, int) == ", TypeEnum(t));`
`2814`	`2814`	`}`
`2815`	`2815`	`Write(") ", OpenBrace());`
`2816`	`2816`	`Write("va_end(args);", Newline());`
Original file line number	Diff line number	Diff line change
`@@ -821,7 +821,7 @@ wasm_rt_func_type_t wasm2c_test_get_func_type(uint32_t param_count, uint32_t res`
`821`	`821`
`822`	`822`	`if (param_count == 2 && result_count == 1) {`
`823`	`823`	`va_start(args, result_count);`
`824`		`- if (true && va_arg(args, wasm_rt_type_t) == WASM_RT_I32 && va_arg(args, wasm_rt_type_t) == WASM_RT_I32 && va_arg(args, wasm_rt_type_t) == WASM_RT_I32) {`
	`824`	`+ if (true && va_arg(args, int) == WASM_RT_I32 && va_arg(args, int) == WASM_RT_I32 && va_arg(args, int) == WASM_RT_I32) {`
`825`	`825`	`va_end(args);`
`826`	`826`	`return w2c_test_t0;`
`827`	`827`	`}`