let generator deal with fetching descr from the cache

Author: iritkatriel

Include/internal/pycore_opcode_metadata.h

@@ -429,14 +429,14 @@ def test_invalid_bytecode(self):
         def foo():
             pass
 
-        # assert that opcode 229 is invalid
-        self.assertEqual(opname[229], '<229>')
+        # assert that opcode 135 is invalid
+        self.assertEqual(opname[135], '<135>')
 
-        # change first opcode to 0xeb (=229)
+        # change first opcode to 0x87 (=135)
         foo.__code__ = foo.__code__.replace(
-            co_code=b'\xe5' + foo.__code__.co_code[1:])
+            co_code=b'\x87' + foo.__code__.co_code[1:])
 
-        msg = "unknown opcode 229"
+        msg = "unknown opcode 135"
         with self.assertRaisesRegex(SystemError, msg):
             foo()
 

Lib/test/test_code.py

@@ -742,35 +742,31 @@ dummy_func(
         #endif
         }
 
-       op(_GUARD_BINARY_OP_EXTEND, (left, right -- left, right)) {
+       op(_GUARD_BINARY_OP_EXTEND, (descr/4, left, right -- left, right)) {
             PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
             PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
+            _PyBinaryOpSpecializationDescr *d = (_PyBinaryOpSpecializationDescr*)descr;
             assert(INLINE_CACHE_ENTRIES_BINARY_OP == 5);
-            _PyBinaryOpCache *cache = (_PyBinaryOpCache *)(next_instr - INLINE_CACHE_ENTRIES_BINARY_OP);
-            _PyBinaryOpSpecializationDescr *descr =
-                (_PyBinaryOpSpecializationDescr *)read_void(cache->external_cache);
-            assert(descr && descr->guard);
-            int res = descr->guard(left_o, right_o);
+            assert(d && d->guard);
+            int res = d->guard(left_o, right_o);
             EXIT_IF(!res);
         }
 
-        pure op(_BINARY_OP_EXTEND, (left, right -- res)) {
+        pure op(_BINARY_OP_EXTEND, (descr/4, left, right -- res)) {
             PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
             PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
             assert(INLINE_CACHE_ENTRIES_BINARY_OP == 5);
-            _PyBinaryOpCache *cache = (_PyBinaryOpCache *)(next_instr - INLINE_CACHE_ENTRIES_BINARY_OP);
-            _PyBinaryOpSpecializationDescr *descr =
-                (_PyBinaryOpSpecializationDescr *)read_void(cache->external_cache);
+            _PyBinaryOpSpecializationDescr *d = (_PyBinaryOpSpecializationDescr*)descr;
 
             STAT_INC(BINARY_OP, hit);
 
-            PyObject *res_o = descr->action(left_o, right_o);
+            PyObject *res_o = d->action(left_o, right_o);
             DECREF_INPUTS();
             res = PyStackRef_FromPyObjectSteal(res_o);
         }
 
         macro(BINARY_OP_EXTEND) =
-            _GUARD_BINARY_OP_EXTEND + unused/5 + _BINARY_OP_EXTEND;
+            unused/1 + _GUARD_BINARY_OP_EXTEND + descr/-4 + _BINARY_OP_EXTEND;
 
         macro(BINARY_OP_INPLACE_ADD_UNICODE) =
             _GUARD_BOTH_UNICODE + unused/5 + _BINARY_OP_INPLACE_ADD_UNICODE;

Python/bytecodes.c

@@ -357,9 +357,12 @@ def uops(self) -> list[UOp] | None:
     def uop(self) -> UOp | None:
         if tkn := self.expect(lx.IDENTIFIER):
             if self.expect(lx.DIVIDE):
+                sign = 1
+                if negate := self.expect(lx.MINUS):
+                    sign = -1
                 if num := self.expect(lx.NUMBER):
                     try:
-                        size = int(num.text)
+                        size = sign * int(num.text)
                     except ValueError:
                         raise self.make_syntax_error(
                             f"Expected integer, got {num.text!r}"