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

feat(tvix/eval): Box Value::Catchable

Browse source 
This is now the only enum variant for Value that is larger than 8
bytes (it's 16 bytes), so boxing it (especially since it's not
perf-critical) allows us to get the Value size down to only 16 bytes!

Change-Id: I98598e2b762944448bef982e8ff7da6d6683c4aa
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10798
Tested-by: BuildkiteCI
Reviewed-by: raitobezarius <tvl@lahfa.xyz>
Autosubmit: aspen <root@gws.fyi>
This commit is contained in:
Aspen Smith 2024-02-10 12:39:24 -05:00 • committed by clbot
parent dd26177319
commit 7e286aab1a
11 changed files with 45 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tvix/eval/src/vm/mod.rs
View file

@ -901,7 +901,7 @@ where
OpCode::OpAssertFail => {
self.stack
.push(Value::Catchable(CatchableErrorKind::AssertionFailed));
.push(Value::from(CatchableErrorKind::AssertionFailed));
}
// Data-carrying operands should never be executed,
@ -1250,7 +1250,7 @@ async fn add_values(co: GenCo, a: Value, b: Value) -> Result<Value, ErrorKind> {
path.push(vs.to_os_str()?);
crate::value::canon_path(PathBuf::from(path)).into()
}
Err(c) => Value::Catchable(c),
Err(c) => Value::Catchable(Box::new(c)),
}
}
(Value::String(s1), Value::String(s2)) => Value::String(Box::new(s1.concat(&s2))),
@ -1288,8 +1288,8 @@ async fn add_values(co: GenCo, a: Value, b: Value) -> Result<Value, ErrorKind> {
.await;
match (r1, r2) {
(Ok(s1), Ok(s2)) => Value::String(Box::new(s1.concat(&s2))),
(Err(c), _) => return Ok(Value::Catchable(c)),
(_, Err(c)) => return Ok(Value::Catchable(c)),
(Err(c), _) => return Ok(Value::from(c)),
(_, Err(c)) => return Ok(Value::from(c)),
}
}
};