maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

revert(tvix/eval): Don't double-box Path values

Browse source 
This reverts commit d3d41552cf.

This was well-intentioned, but now the boxed Path values are actually
the *largest* Value enum variants, at 16 bytes (because they're
fat-pointers, with a len) instead of 8 bytes like all the other values.
Having the double reference is a reasonable price to pay (it seems; more
benchmarks may end up disagreeing) for a smaller Value repr.

Change-Id: I0d3e84f646c8f5ffd0b7259c4e456637eea360f7
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10797
Tested-by: BuildkiteCI
Autosubmit: aspen <root@gws.fyi>
Reviewed-by: sterni <sternenseemann@systemli.org>
This commit is contained in:
Aspen Smith 2024-02-10 12:35:44 -05:00 • committed by clbot
parent e3c92ac3b4
commit dd26177319
6 changed files with 20 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tvix/eval/src/vm/mod.rs
View file

@ -862,7 +862,7 @@ where
Value::UnresolvedPath(path) => {
let resolved = self
.nix_search_path
.resolve(&self.io_handle, path)
.resolve(&self.io_handle, *path)
.with_span(&frame, self)?;
self.stack.push(resolved.into());
}
@ -882,7 +882,7 @@ where
);
}
Some(mut buf) => {
buf.push(path);
buf.push(*path);
self.stack.push(buf.into());
}
};
@ -1225,7 +1225,7 @@ async fn add_values(co: GenCo, a: Value, b: Value) -> Result<Value, ErrorKind> {
// What we try to do is solely determined by the type of the first value!
let result = match (a, b) {
(Value::Path(p), v) => {
let mut path = p.as_os_str().to_owned();
let mut path = p.into_os_string();
match generators::request_string_coerce(
&co,
v,