Merge pull request #14664 from NixOS/fix-i686-asan

libstore: Align LocalFSStore to 8 bytes even on i686-linux

Author: Ericson2314

src/libstore/include/nix/store/binary-cache-store.hh

@@ -65,7 +65,9 @@ struct BinaryCacheStoreConfig : virtual StoreConfig
  * @note subclasses must implement at least one of the two
  * virtual getFile() methods.
  */
-struct BinaryCacheStore : virtual Store, virtual LogStore
+struct alignas(8) /* Work around ASAN failures on i686-linux. */
+    BinaryCacheStore : virtual Store,
+                       virtual LogStore
 {
     using Config = BinaryCacheStoreConfig;
 

src/libstore/include/nix/store/local-fs-store.hh

@@ -66,7 +66,10 @@ public:
         this, rootDir.get() ? *rootDir.get() + "/nix/store" : storeDir, "real", "Physical path of the Nix store."};
 };
 
-struct LocalFSStore : virtual Store, virtual GcStore, virtual LogStore
+struct alignas(8) /* Work around ASAN failures on i686-linux. */
+    LocalFSStore : virtual Store,
+                   virtual GcStore,
+                   virtual LogStore
 {
     using Config = LocalFSStoreConfig;
 

src/libstore/ssh-store.cc

@@ -37,7 +37,8 @@ StoreReference SSHStoreConfig::getReference() const
     };
 }
 
-struct SSHStore : virtual RemoteStore
+struct alignas(8) /* Work around ASAN failures on i686-linux. */
+    SSHStore : virtual RemoteStore
 {
     using Config = SSHStoreConfig;