1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
|
From 5daaf346c48f53c578ac73ae150a8e076154b34b Mon Sep 17 00:00:00 2001
From: Stuart Archibald <stuartarchibald@users.noreply.github.com>
Origin: https://github.com/numba/numba/pull/8639
Date: Fri, 25 Nov 2022 15:39:38 +0000
Subject: [PATCH 09/20] Add more new op code handling.
* `POP_JUMP_BACKWARD_IF_NONE`
* `POP_JUMP_BACKWARD_IF_NOT_NONE`
---
numba/core/bytecode.py | 4 +++-
numba/core/byteflow.py | 6 ++++++
numba/core/interpreter.py | 6 ++++++
3 files changed, 15 insertions(+), 1 deletion(-)
--- a/numba/core/bytecode.py
+++ b/numba/core/bytecode.py
@@ -94,7 +94,9 @@
if self.opcode in (dis.opmap[k]
for k in ("JUMP_BACKWARD",
"POP_JUMP_BACKWARD_IF_TRUE",
- "POP_JUMP_BACKWARD_IF_FALSE")):
+ "POP_JUMP_BACKWARD_IF_FALSE",
+ "POP_JUMP_BACKWARD_IF_NONE",
+ "POP_JUMP_BACKWARD_IF_NOT_NONE",)):
return self.offset - (self.arg - 1) * 2
elif PYVERSION > (3, 11):
raise NotImplementedError(PYVERSION)
--- a/numba/core/byteflow.py
+++ b/numba/core/byteflow.py
@@ -750,6 +750,12 @@
def op_POP_JUMP_FORWARD_IF_NOT_NONE(self, state, inst):
self._op_POP_JUMP_IF(state, inst)
+ def op_POP_JUMP_BACKWARD_IF_NONE(self, state, inst):
+ self._op_POP_JUMP_IF(state, inst)
+
+ def op_POP_JUMP_BACKWARD_IF_NOT_NONE(self, state, inst):
+ self._op_POP_JUMP_IF(state, inst)
+
def op_POP_JUMP_FORWARD_IF_FALSE(self, state, inst):
self._op_POP_JUMP_IF(state, inst)
--- a/numba/core/interpreter.py
+++ b/numba/core/interpreter.py
@@ -2935,6 +2935,12 @@
def op_POP_JUMP_FORWARD_IF_NOT_NONE(self, inst, pred):
self._jump_if_none(inst, pred, False)
+ def op_POP_JUMP_BACKWARD_IF_NONE(self, inst, pred):
+ self._jump_if_none(inst, pred, True)
+
+ def op_POP_JUMP_BACKWARD_IF_NOT_NONE(self, inst, pred):
+ self._jump_if_none(inst, pred, False)
+
def op_POP_JUMP_FORWARD_IF_FALSE(self, inst, pred):
self._op_JUMP_IF(inst, pred=pred, iftrue=False)
|
