mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(tvix/eval): inline mis-named Local::above()

Browse source 
If self.depth > other.depth then self is deeper than other, so self
is *below* other, not above it.  Let's just inline the function.

Change-Id: I8dda3d90cbc86c8a6fa01bc4a5e506a2e403bd20
Signed-off-by: Adam Joseph <adam@westernsemico.com>
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7090
Reviewed-by: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
This commit is contained in:
Adam Joseph 2022-10-25 02:33:17 -07:00 committed by clbot
parent 0649474206
commit f93f138c6c
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tvix/eval/src/compiler/scope.rs
View file

@ -58,11 +58,6 @@ pub struct Local {
} }
impl Local { impl Local {
/// Does this local live above the other given depth?
pub fn above(&self, theirs: usize) -> bool {
self.depth > theirs
}
/// Does the name of this local match the given string? /// Does the name of this local match the given string?
pub fn has_name(&self, other: &str) -> bool { pub fn has_name(&self, other: &str) -> bool {
match &self.name { match &self.name {
@ -284,7 +279,7 @@ impl Scope {
pub fn stack_index(&self, idx: LocalIdx) -> StackIdx { pub fn stack_index(&self, idx: LocalIdx) -> StackIdx {
let uninitialised_count = self.locals[..(idx.0)] let uninitialised_count = self.locals[..(idx.0)]
.iter() .iter()
.filter(|l| !l.initialised && self[idx].above(l.depth)) .filter(|l| !l.initialised && self[idx].depth > l.depth)
.count(); .count();
StackIdx(idx.0 - uninitialised_count) StackIdx(idx.0 - uninitialised_count)