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

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

Browse source 
PathBuf internally contains a heap pointer (an OsString), so we were in
effect double-boxing here. Removing the extra layer by making
Tvix::Value represented by a Box<Path> rather than a Box<PathBuf> saves
us an indirection, while still avoiding the extra memory overhead of the
capacity which was the reason we were boxing PathBuf in the first place.

Change-Id: I8c185b9d4646161d1921917f83e87421496a3e24
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10725
Reviewed-by: sterni <sternenseemann@systemli.org>
Autosubmit: aspen <root@gws.fyi>
Tested-by: BuildkiteCI
This commit is contained in:
Aspen Smith 2024-01-31 10:19:13 -05:00 • committed by aspen
parent 201173afac
commit d3d41552cf
6 changed files with 23 additions and 20 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(Box::new(home_relative_path.into())),
Value::UnresolvedPath(PathBuf::from(home_relative_path).into_boxed_path()),
node,
);
self.push_op(OpCode::OpResolveHomePath, node);
@ -408,7 +408,10 @@ 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(Box::new(path.into())), node);
c.emit_constant(
Value::UnresolvedPath(PathBuf::from(path).into_boxed_path()),
node,
);
c.push_op(OpCode::OpFindFile, node);
});
} else {
@ -419,7 +422,7 @@ impl Compiler<'_> {
// TODO: Use https://github.com/rust-lang/rfcs/issues/2208
// once it is available
let value = Value::Path(Box::new(crate::value::canon_path(path)));
let value = Value::Path(crate::value::canon_path(path).into_boxed_path());
self.emit_constant(value, node);
}