cleanup align fix

openbook-dex · May 2, 2024 · 0142fdd · 0142fdd
1 parent e666f5b
commit 0142fdd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/3rdparty/anchor b/3rdparty/anchor
diff --git a/programs/openbook-v2/src/state/orderbook/nodes.rs b/programs/openbook-v2/src/state/orderbook/nodes.rs
@@ -237,13 +237,12 @@ impl LeafNode {
 
 #[derive(Copy, Clone, bytemuck::Pod, bytemuck::Zeroable)]
 #[repr(C)]
+#[repr(align(8))]
 pub struct FreeNode {
     pub(crate) tag: u8, // NodeTag
     pub(crate) padding: [u8; 3],
     pub(crate) next: NodeHandle,
-    pub(crate) reserved: [u8; NODE_SIZE - 16],
-    // essential to make AnyNode alignment the same as other node types
-    pub(crate) force_align: u64,
+    pub(crate) reserved: [u8; NODE_SIZE - 8],
 }
 const_assert_eq!(size_of::<FreeNode>(), NODE_SIZE);
 const_assert_eq!(size_of::<FreeNode>() % 8, 0);
@@ -254,6 +253,7 @@ pub struct AnyNode {
     pub tag: u8,
     pub data: [u8; 79],
     // essential to make AnyNode alignment the same as other node types
+    // should prefer repr(align(8)), but that's not compatible with anchor's zero_copy attribute
     pub force_align: u64,
 }
 const_assert_eq!(size_of::<AnyNode>(), NODE_SIZE);