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

14
tvix/eval/src/value/mod.rs
View file

@ -3,7 +3,7 @@
use std::cmp::Ordering;
use std::fmt::Display;
use std::num::{NonZeroI32, NonZeroUsize};
use std::path::{Path, PathBuf};
use std::path::PathBuf;
use std::rc::Rc;
use bstr::{BString, ByteVec};
@ -50,7 +50,7 @@ pub enum Value {
String(Box<NixString>),
#[serde(skip)]
Path(Box<Path>),
Path(Box<PathBuf>),
Attrs(Box<NixAttrs>),
List(NixList),
@ -76,7 +76,7 @@ pub enum Value {
#[serde(skip)]
DeferredUpvalue(StackIdx),
#[serde(skip)]
UnresolvedPath(Box<Path>),
UnresolvedPath(Box<PathBuf>),
#[serde(skip)]
Json(Box<serde_json::Value>),
@ -351,7 +351,7 @@ impl Value {
import_paths: true, ..
},
) => {
let imported = generators::request_path_import(co, p.to_path_buf()).await;
let imported = generators::request_path_import(co, *p).await;
// When we import a path from the evaluator, we must attach
// its original path as its context.
context = context.append(NixContextElement::Plain(
@ -365,7 +365,7 @@ impl Value {
import_paths: false,
..
},
) => Ok((*p).as_os_str().as_encoded_bytes().into()),
) => Ok(p.into_os_string().into_encoded_bytes().into()),
// Attribute sets can be converted to strings if they either have an
// `__toString` attribute which holds a function that receives the
@ -707,7 +707,7 @@ impl Value {
Value::String(s),
(**s).clone()
);
gen_cast!(to_path, Box<Path>, "path", Value::Path(p), p.clone());
gen_cast!(to_path, Box<PathBuf>, "path", Value::Path(p), p.clone());
gen_cast!(to_attrs, Box<NixAttrs>, "set", Value::Attrs(a), a.clone());
gen_cast!(to_list, NixList, "list", Value::List(l), l.clone());
gen_cast!(
@ -1018,7 +1018,7 @@ impl From<f64> for Value {
impl From<PathBuf> for Value {
fn from(path: PathBuf) -> Self {
Self::Path(path.into_boxed_path())
Self::Path(Box::new(path))
}
}