JIT: add internal support for None

evilpie · evilpie · commit 9e3f8644103b · 2022-11-17T11:02:16.000+01:00
diff --git a/jit/src/instructions.rs b/jit/src/instructions.rs
@@ -25,6 +25,7 @@ enum JitValue {
     Int(Value),
     Float(Value),
     Bool(Value),
+    None,
 }
 
 impl JitValue {
@@ -41,12 +42,14 @@ impl JitValue {
             JitValue::Int(_) => Some(JitType::Int),
             JitValue::Float(_) => Some(JitType::Float),
             JitValue::Bool(_) => Some(JitType::Bool),
+            JitValue::None => None,
         }
     }
 
     fn into_value(self) -> Option<Value> {
         match self {
             JitValue::Int(val) | JitValue::Float(val) | JitValue::Bool(val) => Some(val),
+            JitValue::None => None,
         }
     }
 }
@@ -122,6 +125,7 @@ impl<'a, 'b> FunctionCompiler<'a, 'b> {
                 Ok(self.builder.ins().bint(types::I8, val))
             }
             JitValue::Bool(val) => Ok(val),
+            JitValue::None => Ok(self.builder.ins().iconst(types::I8, 0)),
         }
     }
 
@@ -193,6 +197,10 @@ impl<'a, 'b> FunctionCompiler<'a, 'b> {
                 self.stack.push(JitValue::Bool(val));
                 Ok(())
             }
+            BorrowedConstant::None => {
+                self.stack.push(JitValue::None);
+                Ok(())
+            }
             _ => Err(JitCompileError::NotSupported),
         }
     }
diff --git a/jit/tests/lib.rs b/jit/tests/lib.rs
@@ -4,3 +4,4 @@ mod bool_tests;
 mod float_tests;
 mod int_tests;
 mod misc_tests;
+mod none_tests;
diff --git a/jit/tests/none_tests.rs b/jit/tests/none_tests.rs
@@ -0,0 +1,24 @@
+#[test]
+fn test_not() {
+    let not_ = jit_function! { not_(x: i64) -> bool => r##"
+        def not_(x: int):
+            return not None
+    "## };
+
+    assert_eq!(not_(0), Ok(true));
+}
+
+#[test]
+fn test_if_not() {
+    let if_not = jit_function! { if_not(x: i64) -> i64 => r##"
+        def if_not(x: int):
+            if not None:
+                return 1
+            else:
+                return 0
+
+            return -1
+    "## };
+
+    assert_eq!(if_not(0), Ok(1));
+}

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ enum JitValue {`
`25`	`25`	`Int(Value),`
`26`	`26`	`Float(Value),`
`27`	`27`	`Bool(Value),`
	`28`	`+ None,`
`28`	`29`	`}`
`29`	`30`
`30`	`31`	`impl JitValue {`
`@@ -41,12 +42,14 @@ impl JitValue {`
`41`	`42`	`JitValue::Int(_) => Some(JitType::Int),`
`42`	`43`	`JitValue::Float(_) => Some(JitType::Float),`
`43`	`44`	`JitValue::Bool(_) => Some(JitType::Bool),`
	`45`	`+ JitValue::None => None,`
`44`	`46`	`}`
`45`	`47`	`}`
`46`	`48`
`47`	`49`	`fn into_value(self) -> Option<Value> {`
`48`	`50`	`match self {`
`49`	`51`	`JitValue::Int(val) \| JitValue::Float(val) \| JitValue::Bool(val) => Some(val),`
	`52`	`+ JitValue::None => None,`
`50`	`53`	`}`
`51`	`54`	`}`
`52`	`55`	`}`
`@@ -122,6 +125,7 @@ impl<'a, 'b> FunctionCompiler<'a, 'b> {`
`122`	`125`	`Ok(self.builder.ins().bint(types::I8, val))`
`123`	`126`	`}`
`124`	`127`	`JitValue::Bool(val) => Ok(val),`
	`128`	`+ JitValue::None => Ok(self.builder.ins().iconst(types::I8, 0)),`
`125`	`129`	`}`
`126`	`130`	`}`
`127`	`131`
`@@ -193,6 +197,10 @@ impl<'a, 'b> FunctionCompiler<'a, 'b> {`
`193`	`197`	`self.stack.push(JitValue::Bool(val));`
`194`	`198`	`Ok(())`
`195`	`199`	`}`
	`200`	`+ BorrowedConstant::None => {`
	`201`	`+ self.stack.push(JitValue::None);`
	`202`	`+ Ok(())`
	`203`	`+ }`
`196`	`204`	`_ => Err(JitCompileError::NotSupported),`
`197`	`205`	`}`
`198`	`206`	`}`