Skip to content

jit: fix recursive call return value type tagging #8499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
kyokuping wants to merge 1 commit into
base: main
Choose a base branch
from
+44 −2
Draft

jit: fix recursive call return value type tagging #8499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions crates/jit/src/instructions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,8 +548,22 @@ impl<'a, 'b> FunctionCompiler<'a, 'b> {
match self.stack.pop().ok_or(JitCompileError::BadBytecode)? {
JitValue::FuncRef(reference) => {
let call = self.builder.ins().call(reference, &args);
let returns = self.builder.inst_results(call);
self.stack.push(JitValue::Int(returns[0]));
// The only callable reachable here is this function itself,
// so the result carries the declared return type - it is not
// always an Int. A function whose return type is still
// unknown has no return slot in the signature it was
// declared with, and there is nothing to type the result as.
let ret = match *self.builder.inst_results(call) {
[] => None,
[val] => Some(val),
_ => return Err(JitCompileError::NotSupported),
};
let val = match (self.sig.ret.clone(), ret) {
(Some(JitType::None), None) => JitValue::None,
(Some(ty), Some(val)) => JitValue::from_type_and_value(ty, val),
_ => return Err(JitCompileError::NotSupported),
};
self.stack.push(val);

Ok(())
}
Expand Down
14 changes: 14 additions & 0 deletions crates/jit/tests/bool_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,4 +202,18 @@ mod tests {
assert_eq!(lte(false, 1), Ok(1));
assert_eq!(lte(true, 0), Ok(0));
}

#[test]
fn recursive_bool() {
let recursive_bool = jit_function! { recursive_bool(n: i64) -> bool => r##"
def recursive_bool(n: int) -> bool:
if n == 0:
return True
return not recursive_bool(n - 1)
"## };

assert_eq!(recursive_bool(0), Ok(true));
assert_eq!(recursive_bool(1), Ok(false));
assert_eq!(recursive_bool(4), Ok(true));
}
}
14 changes: 14 additions & 0 deletions crates/jit/tests/float_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,4 +379,18 @@ mod tests {
assert_eq!(float_lte(f64::NAN, f64::NAN), Ok(false));
assert_eq!(float_lte(f64::INFINITY, f64::NEG_INFINITY), Ok(false));
}

#[test]
fn recursive_float() {
let recursive_float = jit_function! { recursive_float(n: i64) -> f64 => r##"
def recursive_float(n: int) -> float:
if n == 0:
return 1.0
return recursive_float(n - 1) / 2.0
"## };

assert_eq!(recursive_float(0), Ok(1.0));
assert_eq!(recursive_float(1), Ok(0.5));
assert_eq!(recursive_float(4), Ok(0.0625));
}
}
Loading