diff options
| author | Aspen Smith <root@gws.fyi> | 2024-02-10T17·35-0500 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2024-02-13T16·49+0000 |
| commit | dd261773192d0928571f806892d8065fbba1cf2d (patch) | |
| tree | 583b8571587a3e3adfb0cc368116b873d2380396 /tvix/eval/src/compiler/mod.rs | |
| parent | e3c92ac3b4b07a7397b565738ec4237b9bf621f6 (diff) | |
revert(tvix/eval): Don't double-box Path values r/7507
This reverts commit d3d41552cf1f6485f8ebc597a2128a0d15b030a5. 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>
Diffstat (limited to 'tvix/eval/src/compiler/mod.rs')
| -rw-r--r-- | tvix/eval/src/compiler/mod.rs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tvix/eval/src/compiler/mod.rs b/tvix/eval/src/compiler/mod.rs index 4a7b5fd5ba9c..0a9ee2320b1d 100644 --- a/tvix/eval/src/compiler/mod.rs +++ b/tvix/eval/src/compiler/mod.rs @@ -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); } |