From dd261773192d0928571f806892d8065fbba1cf2d Mon Sep 17 00:00:00 2001 From: Aspen Smith Date: Sat, 10 Feb 2024 12:35:44 -0500 Subject: revert(tvix/eval): Don't double-box Path values 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 Reviewed-by: sterni --- tvix/eval/src/compiler/mod.rs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'tvix/eval/src/compiler/mod.rs') 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); } -- cgit 1.4.1