4516cd09c5
When dealing with a formal argument in a function argument pattern that has a default expression, there are two different things that can happen at runtime: Either we select its value from the passed attribute successfully or we need to use the default expression. Both of these may be thunks and both of these may need finalisers. However, in the former case this is taken care of elsewhere, the value will always be finalised already if necessary. In the latter case we may need to finalise the thunk resulting from the default expression. However, the thunk corresponding to the expression may never end up in the local's stack slot. Since finalisation goes by stack slot (and not constants), we need to prevent a case where we don't fall back to the default expression, but finalise anyways. Previously, we worked around this by making `OpFinalise` ignore non-thunks. Since finalisation of already evaluated thunks still crashed, the faulty compilation of function pattern arguments could still cause a crash. As a new approach, we reinstate the old behavior of `OpFinalise` to crash whenever encountering something that is either not a thunk or doesn't need finalisation. This can also help catching (similar) miscompilations in the future. To then prevent the crash, we need to track whether we have fallen back or not at runtime. This is done using an additional phantom on the stack that holds a new `FinaliseRequest` value. When it comes to finalisation we check this value and conditionally execute `OpFinalise` based on its value. Resolves b/261 and b/265 (partially). Change-Id: Ic04fb80ec671a2ba11fa645090769c335fb7f58b Reviewed-on: https://cl.tvl.fyi/c/depot/+/8705 Reviewed-by: tazjin <tazjin@tvl.su> Tested-by: BuildkiteCI Autosubmit: sterni <sternenseemann@systemli.org>
188 lines
5.8 KiB
Rust
188 lines
5.8 KiB
Rust
//! This module implements the instruction set running on the abstract
|
|
//! machine implemented by tvix.
|
|
|
|
use std::ops::{AddAssign, Sub};
|
|
|
|
/// Index of a constant in the current code chunk.
|
|
#[repr(transparent)]
|
|
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
|
pub struct ConstantIdx(pub usize);
|
|
|
|
/// Index of an instruction in the current code chunk.
|
|
#[repr(transparent)]
|
|
#[derive(Clone, Copy, Debug)]
|
|
pub struct CodeIdx(pub usize);
|
|
|
|
impl AddAssign<usize> for CodeIdx {
|
|
fn add_assign(&mut self, rhs: usize) {
|
|
*self = CodeIdx(self.0 + rhs)
|
|
}
|
|
}
|
|
|
|
impl Sub<usize> for CodeIdx {
|
|
type Output = Self;
|
|
|
|
fn sub(self, rhs: usize) -> Self::Output {
|
|
CodeIdx(self.0 - rhs)
|
|
}
|
|
}
|
|
|
|
/// Index of a value in the runtime stack. This is an offset
|
|
/// *relative to* the VM value stack_base of the CallFrame
|
|
/// containing the opcode which contains this StackIdx.
|
|
#[repr(transparent)]
|
|
#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd)]
|
|
pub struct StackIdx(pub usize);
|
|
|
|
/// Index of an upvalue within a closure's bound-variable upvalue
|
|
/// list. This is an absolute index into the Upvalues of the
|
|
/// CallFrame containing the opcode which contains this UpvalueIdx.
|
|
#[repr(transparent)]
|
|
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
|
pub struct UpvalueIdx(pub usize);
|
|
|
|
/// Offset by which an instruction pointer should change in a jump.
|
|
#[repr(transparent)]
|
|
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
|
pub struct JumpOffset(pub usize);
|
|
|
|
/// Provided count for an instruction (could represent e.g. a number
|
|
/// of elements).
|
|
#[repr(transparent)]
|
|
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
|
pub struct Count(pub usize);
|
|
|
|
/// All variants of this enum carry a bounded amount of data to
|
|
/// ensure that no heap allocations are needed for an Opcode.
|
|
#[warn(variant_size_differences)]
|
|
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
|
pub enum OpCode {
|
|
/// Push a constant onto the stack.
|
|
OpConstant(ConstantIdx),
|
|
|
|
/// Discard a value from the stack.
|
|
OpPop,
|
|
|
|
// Unary operators
|
|
OpInvert,
|
|
OpNegate,
|
|
|
|
// Arithmetic binary operators
|
|
OpAdd,
|
|
OpSub,
|
|
OpMul,
|
|
OpDiv,
|
|
|
|
// Comparison operators
|
|
OpEqual,
|
|
OpLess,
|
|
OpLessOrEq,
|
|
OpMore,
|
|
OpMoreOrEq,
|
|
|
|
// Logical operators & generic jumps
|
|
OpJump(JumpOffset),
|
|
OpJumpIfTrue(JumpOffset),
|
|
OpJumpIfFalse(JumpOffset),
|
|
OpJumpIfNotFound(JumpOffset),
|
|
OpJumpIfNoFinaliseRequest(JumpOffset),
|
|
|
|
// Attribute sets
|
|
/// Construct an attribute set from the given number of key-value pairs on the top of the stack
|
|
///
|
|
/// Note that this takes the count of *pairs*, not the number of *stack values* - the actual
|
|
/// number of values popped off the stack will be twice the argument to this op
|
|
OpAttrs(Count),
|
|
OpAttrsUpdate,
|
|
OpAttrsSelect,
|
|
OpAttrsTrySelect,
|
|
OpHasAttr,
|
|
|
|
/// Throw an error if the attribute set at the top of the stack has any attributes
|
|
/// other than those listed in the formals of the current lambda
|
|
///
|
|
/// Panics if the current frame is not a lambda with formals
|
|
OpValidateClosedFormals,
|
|
|
|
// `with`-handling
|
|
OpPushWith(StackIdx),
|
|
OpPopWith,
|
|
OpResolveWith,
|
|
|
|
// Lists
|
|
OpList(Count),
|
|
OpConcat,
|
|
|
|
// Strings
|
|
OpInterpolate(Count),
|
|
/// Force the Value on the stack and coerce it to a string, always using
|
|
/// `CoercionKind::Weak`.
|
|
OpCoerceToString,
|
|
|
|
// Paths
|
|
/// Attempt to resolve the Value on the stack using the configured [`NixSearchPath`][]
|
|
///
|
|
/// [`NixSearchPath`]: crate::nix_search_path::NixSearchPath
|
|
OpFindFile,
|
|
|
|
/// Attempt to resolve a path literal relative to the home dir
|
|
OpResolveHomePath,
|
|
|
|
// Type assertion operators
|
|
OpAssertBool,
|
|
OpAssertAttrs,
|
|
|
|
/// Access local identifiers with statically known positions.
|
|
OpGetLocal(StackIdx),
|
|
|
|
/// Close scopes while leaving their expression value around.
|
|
OpCloseScope(Count), // number of locals to pop
|
|
|
|
/// Return an error indicating that an `assert` failed
|
|
OpAssertFail,
|
|
|
|
// Lambdas & closures
|
|
OpCall,
|
|
OpGetUpvalue(UpvalueIdx),
|
|
/// A Closure which has upvalues but no self-references
|
|
OpClosure(ConstantIdx),
|
|
/// A Closure which has self-references (direct or via upvalues)
|
|
OpThunkClosure(ConstantIdx),
|
|
/// A suspended thunk, used to ensure laziness
|
|
OpThunkSuspended(ConstantIdx),
|
|
OpForce,
|
|
|
|
/// Finalise initialisation of the upvalues of the value in the given stack
|
|
/// index (which must be a Value::Thunk) after the scope is fully bound.
|
|
OpFinalise(StackIdx),
|
|
|
|
/// Final instruction emitted in a chunk. Does not have an
|
|
/// inherent effect, but can simplify VM logic as a marker in some
|
|
/// cases.
|
|
///
|
|
/// Can be thought of as "returning" the value to the parent
|
|
/// frame, hence the name.
|
|
OpReturn,
|
|
|
|
// [`OpClosure`], [`OpThunkSuspended`], and [`OpThunkClosure`] have a
|
|
// variable number of arguments to the instruction, which is
|
|
// represented here by making their data part of the opcodes.
|
|
// Each of these two opcodes has a `ConstantIdx`, which must
|
|
// reference a `Value::Blueprint(Lambda)`. The `upvalue_count`
|
|
// field in that `Lambda` indicates the number of arguments it
|
|
// takes, and the opcode must be followed by exactly this number
|
|
// of `Data*` opcodes. The VM skips over these by advancing the
|
|
// instruction pointer.
|
|
//
|
|
// It is illegal for a `Data*` opcode to appear anywhere else.
|
|
/// Populate a static upvalue by copying from the stack immediately.
|
|
DataStackIdx(StackIdx),
|
|
/// Populate a static upvalue of a thunk by copying it the stack, but do
|
|
/// when the thunk is finalised (by OpFinalise) rather than immediately.
|
|
DataDeferredLocal(StackIdx),
|
|
/// Populate a static upvalue by copying it from the upvalues of an
|
|
/// enclosing scope.
|
|
DataUpvalueIdx(UpvalueIdx),
|
|
/// Populate dynamic upvalues by saving a copy of the with-stack.
|
|
DataCaptureWith,
|
|
}
|