nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-28 21:21:00 +01:00
Code Activity

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

Browse source 
libstore: Align LocalFSStore to 8 bytes even on i686-linux
This commit is contained in:
John Ericson 2025-11-27 04:26:08 +00:00 • committed by GitHub
commit a3d77a4bf2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libstore/include/nix/store/binary-cache-store.hh
View file

@ -65,7 +65,9 @@ struct BinaryCacheStoreConfig : virtual StoreConfig
* @note subclasses must implement at least one of the two * @note subclasses must implement at least one of the two
* virtual getFile() methods. * 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; using Config = BinaryCacheStoreConfig;

5
src/libstore/include/nix/store/local-fs-store.hh
View file

@ -66,7 +66,10 @@ public:
this, rootDir.get() ? *rootDir.get() + "/nix/store" : storeDir, "real", "Physical path of the Nix store."}; 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; using Config = LocalFSStoreConfig;

3
src/libstore/ssh-store.cc
View file

@ -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; using Config = SSHStoreConfig;