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

libexpr: Fix tests on 32 bit systems

Browse source 
This test is now pointless and the comment is outdated. Also the test fails
on 32 bit systems with:

../nix_api_value_internal.cc:22: Failure
Expected equality of these values:
  sizeof(nix::Value)
    Which is: 12
  sizeof(nix_value)
    Which is: 8

It just happeneded to work because Value is 16 bytes and nix_value was also 16 bytes.

Also get rid of a pointless inline in new_nix_value, since it's already static and
inline there does nothing.
This commit is contained in:
Sergei Zimmerman 2025-11-28 00:35:56 +03:00
parent 11b0fcd6cd
commit 7dfad3dba7
No known key found for this signature in database
2 changed files with 1 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libexpr-c/nix_api_value.cc
View file

@ -58,7 +58,7 @@ static nix::Value & check_value_out(nix_value * value)
return v; return v;
} }
static inline nix_value * new_nix_value(nix::Value * v, nix::EvalMemory & mem) static nix_value * new_nix_value(nix::Value * v, nix::EvalMemory & mem)
{ {
nix_value * ret = new (mem.allocBytes(sizeof(nix_value))) nix_value{ nix_value * ret = new (mem.allocBytes(sizeof(nix_value))) nix_value{
.value = v, .value = v,

8
src/libexpr-tests/nix_api_value_internal.cc
View file

@ -14,12 +14,4 @@
namespace nixC { namespace nixC {
TEST_F(nix_api_expr_test, as_nix_value_ptr)
{
// nix_alloc_value casts nix::Value to nix_value
// It should be obvious from the decl that that works, but if it doesn't,
// the whole implementation would be utterly broken.
ASSERT_EQ(sizeof(nix::Value), sizeof(nix_value));
}
} // namespace nixC } // namespace nixC