Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ericson2314 merged 1 commit into from
Nov 27, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/libstore/include/nix/store/binary-cache-store.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
5 changes: 4 additions & 1 deletion src/libstore/include/nix/store/local-fs-store.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
3 changes: 2 additions & 1 deletion src/libstore/ssh-store.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Loading