fix post-merge conflicts

crates/c/src/lib.rs

@@ -28,7 +28,7 @@ struct C {
     needs_union_double_int64: bool,
     prim_names: HashSet<String>,
     world: String,
-    sizes: SizeAlign64,
+    sizes: SizeAlign,
     renamed_interfaces: HashMap<WorldKey, String>,
 
     world_id: Option<WorldId>,
@@ -2234,7 +2234,7 @@ impl<'a, 'b> FunctionBindgen<'a, 'b> {
 impl Bindgen for FunctionBindgen<'_, '_> {
     type Operand = String;
 
-    fn sizes(&self) -> &SizeAlign64 {
+    fn sizes(&self) -> &SizeAlign {
         &self.gen.gen.sizes
     }
 

crates/core/src/abi.rs

@@ -1,7 +1,7 @@
 pub use wit_parser::abi::{AbiVariant, WasmSignature, WasmType};
 use wit_parser::{
     align_to_arch, Alignment, ArchitectureSize, ElementInfo, Enum, Flags, FlagsRepr, Function,
-    Handle, Int, Record, Resolve, Result_, Results, SizeAlign64, Tuple, Type, TypeDefKind, TypeId,
+    Handle, Int, Record, Resolve, Result_, Results, SizeAlign, Tuple, Type, TypeDefKind, TypeId,
     Variant,
 };
 
@@ -709,7 +709,7 @@ pub trait Bindgen {
     fn finish_block(&mut self, operand: &mut Vec<Self::Operand>);
 
     /// Returns size information that was previously calculated for all types.
-    fn sizes(&self) -> &SizeAlign64;
+    fn sizes(&self) -> &SizeAlign;
 
     /// Returns whether or not the specified element type is represented in a
     /// "canonical" form for lists. This dictates whether the `ListCanonLower`
@@ -1145,10 +1145,7 @@ impl<'a, B: Bindgen> Generator<'a, B> {
                             .sizes()
                             .record(func.params.iter().map(|t| &t.1));
                         self.emit(&Instruction::GetArg { nth: 0 });
-                        self.emit(&Instruction::GuestDeallocate {
-                            size: info.size.size_wasm32(),
-                            align: info.align.align_wasm32(),
-                        });
+                        self.emit(&Instruction::GuestDeallocate { size, align });
                     }
                 }