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

9
tvix/eval/src/compiler/mod.rs
View file

@ -390,7 +390,7 @@ impl Compiler<'_> {
let home_relative_path = &raw_path[2..(raw_path.len())];
self.emit_constant(
Value::UnresolvedPath(PathBuf::from(home_relative_path).into_boxed_path()),
Value::UnresolvedPath(Box::new(home_relative_path.into())),
node,
);
self.push_op(OpCode::OpResolveHomePath, node);
@ -408,10 +408,7 @@ impl Compiler<'_> {
let path = &raw_path[1..(raw_path.len() - 1)];
// Make a thunk to resolve the path (without using `findFile`, at least for now?)
return self.thunk(slot, node, move |c, _| {
c.emit_constant(
Value::UnresolvedPath(PathBuf::from(path).into_boxed_path()),
node,
);
c.emit_constant(Value::UnresolvedPath(Box::new(path.into())), node);
c.push_op(OpCode::OpFindFile, node);
});
} else {
@ -422,7 +419,7 @@ impl Compiler<'_> {
// TODO: Use https://github.com/rust-lang/rfcs/issues/2208
// once it is available
let value = Value::Path(crate::value::canon_path(path).into_boxed_path());
let value = Value::Path(Box::new(crate::value::canon_path(path)));
self.emit_constant(value, node);
}