fix(wasm-api): fix i64/u64 handling in sizeof()

thi-ng · Oct 26, 2022 · 825add3 · 825add3
1 parent 6bbc882
commit 825add3
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 18 deletions.
diff --git a/packages/wasm-api/src/codegen.ts b/packages/wasm-api/src/codegen.ts
@@ -63,12 +63,13 @@ const sizeOf = defmulti<
 			} else if (isSlice(field)) {
 				size = opts.target.usizeBytes * 2;
 			} else {
-				size = isNumeric(field.type)
-					? SIZEOF[<Type>field.type]
-					: isWasmString(field.type)
-					? opts.target.usizeBytes *
-					  (opts.stringType === "slice" ? 2 : 1)
-					: sizeOf(types[field.type], types, align, opts);
+				size =
+					isNumeric(field.type) || isBigNumeric(field.type)
+						? SIZEOF[<Type>field.type]
+						: isWasmString(field.type)
+						? opts.target.usizeBytes *
+						  (opts.stringType === "slice" ? 2 : 1)
+						: sizeOf(types[field.type], types, align, opts);
 				if (field.tag == "array" || field.tag === "vec") {
 					size *= field.len!;
 					if (field.sentinel !== undefined && field.tag === "array") {
@@ -128,17 +129,16 @@ const alignOf = defmulti<
 				field.type = opts.target.usize;
 			}
 			if (field.pad) return (field.__align = 1);
-			return (field.__align =
-				isPointerLike(field) || isWasmString(field.type)
-					? align.align(<StructField>{ type: opts.target.usize })
-					: isNumeric(field.type) || isBigNumeric(field.type)
-					? align.align(field)
-					: alignOf(
-							types[field.type],
-							types,
-							selectAlignment(types[field.type]),
-							opts
-					  ));
+			return (field.__align = isPointerLike(field)
+				? align.align(<StructField>{ type: opts.target.usize })
+				: isNumeric(field.type) || isBigNumeric(field.type)
+				? align.align(field)
+				: alignOf(
+						types[field.type],
+						types,
+						selectAlignment(types[field.type]),
+						opts
+				  ));
 		},
 
 		enum: (type, _, align) => {

diff --git a/packages/wasm-api/src/codegen/utils.ts b/packages/wasm-api/src/codegen/utils.ts
@@ -34,7 +34,13 @@ export const isPointer = (f: StructField) => f.tag === "ptr";
 
 export const isSlice = (f: StructField) => f.tag === "slice";
 
-export const isPointerLike = (f: StructField) => isPointer(f) || isSlice(f);
+/**
+ * Returns true iff the struct field is a pointer, slice or "string" type
+ *
+ * @param f
+ */
+export const isPointerLike = (f: StructField) =>
+	isPointer(f) || isSlice(f) || isWasmString(f.type);
 
 /**
  * Takes an array of strings or splits given string into lines, word wraps and