修复空的结构体在IOS传参时导致的内存布局crash (#1925)

Tencent · Nov 21, 2024 · 4ecf3e9 · 4ecf3e9
1 parent 283f45b
commit 4ecf3e9
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/unity/Assets/core/upm/Editor/Resources/puerts/templates/il2cppvaluetype.tpl.mjs b/unity/Assets/core/upm/Editor/Resources/puerts/templates/il2cppvaluetype.tpl.mjs
@@ -9,18 +9,29 @@ import { FOR, default as t, IF, ENDIF, ELSE } from "./tte.mjs"
 import * as il2cpp_snippets from "./il2cpp_snippets.mjs"
 
 function defineValueType(valueTypeInfo) {
-        // TODO 会存在一个 IsEnum 且 IsGenericParameter 的类型，signature为空，先过滤处理，晚点彻查。
+    // TODO 会存在一个 IsEnum 且 IsGenericParameter 的类型，signature为空，先过滤处理，晚点彻查。
     if (!valueTypeInfo.Signature) return ''
+    var fieldSignatures = il2cpp_snippets.listToJsArray(valueTypeInfo.FieldSignatures);
     return t`// ${valueTypeInfo.CsName}
 struct ${valueTypeInfo.Signature}
 {
-    ${FOR(il2cpp_snippets.listToJsArray(valueTypeInfo.FieldSignatures), (s, i) => t`
+    ${IF(fieldSignatures.length == 0)}
+    union
+    {
+        struct
+        {
+        };
+        uint8_t __padding[1];
+    };
+    ${ELSE()}
+    ${FOR(fieldSignatures, (s, i) => t`
     ${IF(il2cpp_snippets.isNullableStruct(valueTypeInfo.Signature) && i == valueTypeInfo.NullableHasValuePosition)}
     ${il2cpp_snippets.SToCPPType(s)} hasValue;
     ${ELSE()}
     ${il2cpp_snippets.SToCPPType(s)} p${i};
     ${ENDIF()}
     `)}
+    ${ENDIF()}
 };
     `;
 }