refactor(tvix/eval): index into Chunk with ConstantIdx/CodeIdx r/4773

This is a step towards hiding the internal fields of thunk, and making
the interface of the type more predictable.

Part of the preparation for implementing observers.

Change-Id: I1a88a96419c72eb9e2332b56a2dd94afa47e6f88
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6447
Reviewed-by: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI

2 files changed, 22 insertions, 8 deletions

diff --git a/tvix/eval/src/chunk.rs b/tvix/eval/src/chunk.rs
index c89e6ef848..a4d6be752b 100644
--- a/tvix/eval/src/chunk.rs
+++ b/tvix/eval/src/chunk.rs
@@ -1,3 +1,5 @@
+use std::ops::Index;
+
 use crate::opcode::{CodeIdx, ConstantIdx, OpCode};
 use crate::value::Value;
 
@@ -31,6 +33,22 @@ pub struct Chunk {
     pub codemap: std::rc::Rc<codemap::CodeMap>,
 }
 
+impl Index<ConstantIdx> for Chunk {
+    type Output = Value;
+
+    fn index(&self, index: ConstantIdx) -> &Self::Output {
+        &self.constants[index.0]
+    }
+}
+
+impl Index<CodeIdx> for Chunk {
+    type Output = OpCode;
+
+    fn index(&self, index: CodeIdx) -> &Self::Output {
+        &self.code[index.0]
+    }
+}
+
 impl Chunk {
     pub fn push_op(&mut self, data: OpCode, span: codemap::Span) -> CodeIdx {
         let idx = self.code.len();
@@ -45,10 +63,6 @@ impl Chunk {
         ConstantIdx(idx)
     }
 
-    pub fn constant(&self, idx: ConstantIdx) -> &Value {
-        &self.constants[idx.0]
-    }
-
     // Span tracking implementation
 
     fn push_span(&mut self, span: codemap::Span) {
diff --git a/tvix/eval/src/vm.rs b/tvix/eval/src/vm.rs
index d42a2e3033..b9445e39f1 100644
--- a/tvix/eval/src/vm.rs
+++ b/tvix/eval/src/vm.rs
@@ -218,7 +218,7 @@ impl VM {
 
             match op {
                 OpCode::OpConstant(idx) => {
-                    let c = self.chunk().constant(idx).clone();
+                    let c = self.chunk()[idx].clone();
                     self.push(c);
                 }
 
@@ -477,7 +477,7 @@ impl VM {
                 }
 
                 OpCode::OpClosure(idx) => {
-                    let blueprint = match self.chunk().constant(idx) {
+                    let blueprint = match &self.chunk()[idx] {
                         Value::Blueprint(lambda) => lambda.clone(),
                         _ => panic!("compiler bug: non-blueprint in blueprint slot"),
                     };
@@ -501,7 +501,7 @@ impl VM {
                 }
 
                 OpCode::OpThunk(idx) => {
-                    let blueprint = match self.chunk().constant(idx) {
+                    let blueprint = match &self.chunk()[idx] {
                         Value::Blueprint(lambda) => lambda.clone(),
                         _ => panic!("compiler bug: non-blueprint in blueprint slot"),
                     };
@@ -594,7 +594,7 @@ impl VM {
 
     fn resolve_dynamic_upvalue(&mut self, ident_idx: ConstantIdx) -> EvalResult<Value> {
         let chunk = self.chunk();
-        let ident = fallible!(self, chunk.constant(ident_idx).to_str());
+        let ident = fallible!(self, chunk[ident_idx].to_str());
 
         // Peek at the current instruction (note: IP has already
         // advanced!) to see if it is actually data indicating a