beta1 updates

Author: P403n1x87

src/bytecode/instr.py

@@ -269,6 +269,13 @@ class CommonConstant(enum.IntEnum):
     BUILTIN_TUPLE = 2
     BUILTIN_ALL = 3
     BUILTIN_ANY = 4
+    BUILTIN_LIST = 5
+    BUILTIN_SET = 6
+    CONSTANT_NONE = 7
+    CONSTANT_EMPTY_STR = 8
+    CONSTANT_TRUE = 9
+    CONSTANT_FALSE = 10
+    CONSTANT_MINUS_ONE = 11
 
 
 # This make type checking happy but means it won't catch attempt to manipulate an unset

tests/test_bytecode.py

@@ -7,8 +7,8 @@
 import unittest
 
 from bytecode import Bytecode, ConcreteInstr, FreeVar, Instr, Label, SetLineno
-from bytecode.instr import BinaryOp, FormatValue, InstrLocation
-from bytecode.utils import PY312, PY313, PY314
+from bytecode.instr import BinaryOp, CommonConstant, FormatValue, InstrLocation
+from bytecode.utils import PY312, PY313, PY314, PY315
 
 from . import TestCase, get_code
 
@@ -168,6 +168,18 @@ def test_from_code(self):
         bytecode = Bytecode.from_code(code)
         label_else = Label()
         if PY314:
+
+            def _ret_none(lineno):
+                return (
+                    Instr(
+                        "LOAD_COMMON_CONSTANT",
+                        CommonConstant.CONSTANT_NONE,
+                        lineno=lineno,
+                    )
+                    if PY315
+                    else Instr("LOAD_CONST", None, lineno=lineno)
+                )
+
             self.assertInstructionListEqual(
                 bytecode,
                 [
@@ -178,12 +190,12 @@ def test_from_code(self):
                     Instr("NOT_TAKEN", lineno=1),
                     Instr("LOAD_SMALL_INT", 1, lineno=2),
                     Instr("STORE_NAME", "x", lineno=2),
-                    Instr("LOAD_CONST", None, lineno=2),
+                    _ret_none(2),
                     Instr("RETURN_VALUE", lineno=2),
                     label_else,
                     Instr("LOAD_SMALL_INT", 2, lineno=4),
                     Instr("STORE_NAME", "x", lineno=4),
-                    Instr("LOAD_CONST", None, lineno=4),
+                    _ret_none(4),
                     Instr("RETURN_VALUE", lineno=4),
                 ],
             )
@@ -292,7 +304,11 @@ def func():
             ]
             + (
                 [
-                    Instr("LOAD_CONST", None, lineno=3),
+                    Instr(
+                        "LOAD_COMMON_CONSTANT" if PY315 else "LOAD_CONST",
+                        CommonConstant.CONSTANT_NONE if PY315 else None,
+                        lineno=3,
+                    ),
                     Instr("RETURN_VALUE", lineno=3),
                 ]
                 if PY314

tests/test_cfg.py

@@ -19,6 +19,7 @@
     SetLineno,
     dump_bytecode,
 )
+from bytecode.instr import CommonConstant
 from bytecode.utils import PY312, PY313, PY314, PY315
 
 from . import TestCase, disassemble as _disassemble
@@ -33,15 +34,20 @@ def disassemble(
         # drop LOAD_CONST+RETURN_VALUE to only keep 2 instructions,
         # to make unit tests shorter
         block = blocks[-1]
-        test = (
-            (block[-1].name == "RETURN_CONST" and block[-1].arg is None)
-            if PY312 and not PY314
-            else (
+        if PY315:
+            test = (
+                block[-2].name == "LOAD_COMMON_CONSTANT"
+                and block[-2].arg == CommonConstant.CONSTANT_NONE
+                and block[-1].name == "RETURN_VALUE"
+            )
+        elif PY312 and not PY314:
+            test = block[-1].name == "RETURN_CONST" and block[-1].arg is None
+        else:
+            test = (
                 block[-2].name == "LOAD_CONST"
                 and block[-2].arg is None
                 and block[-1].name == "RETURN_VALUE"
             )
-        )
         if not test:
             raise ValueError(
                 "unable to find implicit RETURN_VALUE <None>: %s" % block[-2:]

tests/test_concrete.py

@@ -21,6 +21,7 @@
     SetLineno,
 )
 from bytecode.concrete import ExceptionTableEntry
+from bytecode.instr import CommonConstant
 from bytecode.utils import PY312, PY313, PY314, PY315
 
 from . import TestCase, get_code
@@ -244,7 +245,7 @@ def test_eq(self):
     def test_attr(self):
         code_obj = get_code("x = 5")
         code = ConcreteBytecode.from_code(code_obj)
-        self.assertEqual(code.consts, [5, None])
+        self.assertEqual(code.consts, [5] if PY315 else [5, None])
         self.assertEqual(code.names, ["x"])
         self.assertEqual(code.varnames, [])
         self.assertEqual(code.freevars, [])
@@ -256,7 +257,7 @@ def test_attr(self):
                     ConcreteInstr("CACHE", 0, lineno=0),
                     ConcreteInstr("LOAD_SMALL_INT", 5, lineno=1),
                     ConcreteInstr("STORE_NAME", 0, lineno=1),
-                    ConcreteInstr("LOAD_CONST", 1, lineno=1),
+                    ConcreteInstr("LOAD_COMMON_CONSTANT", 7, lineno=1),
                     ConcreteInstr("RETURN_VALUE", lineno=1),
                 ]
                 if PY315
@@ -333,7 +334,9 @@ def f():
             ]
             + (
                 [
-                    ConcreteInstr("LOAD_CONST", 1),
+                    ConcreteInstr("LOAD_COMMON_CONSTANT", CommonConstant.CONSTANT_NONE)
+                    if PY315
+                    else ConcreteInstr("LOAD_CONST", 1),
                     ConcreteInstr("RETURN_VALUE"),
                 ]
                 if PY314
@@ -457,7 +460,9 @@ def test_extended_lnotab2(self):
             ]
             + (
                 [
-                    ConcreteInstr("LOAD_CONST", 1),
+                    ConcreteInstr("LOAD_COMMON_CONSTANT", CommonConstant.CONSTANT_NONE)
+                    if PY315
+                    else ConcreteInstr("LOAD_CONST", 1),
                     ConcreteInstr("RETURN_VALUE"),
                 ]
                 if PY314
@@ -764,17 +769,18 @@ def foo(x: int, y: int):
                 ConcreteInstr("MAKE_FUNCTION", lineno=1),
                 ConcreteInstr("SET_FUNCTION_ATTRIBUTE", 16, lineno=1),
                 ConcreteInstr("STORE_NAME", 0, lineno=1),
-                ConcreteInstr("LOAD_CONST", 2, lineno=1),
+                ConcreteInstr("LOAD_COMMON_CONSTANT", 7, lineno=1),
                 ConcreteInstr("RETURN_VALUE", lineno=1),
             ]
+            expected_consts = [ann_code, func_code]
             self.assertSequenceEqual(concrete.names, ["foo"])
-            self.assertSequenceEqual(concrete.consts, [ann_code, func_code, None])
+            self.assertSequenceEqual(concrete.consts, expected_consts)
             self.assertInstructionListEqual(list(concrete), expected_py315)
             concrete = ConcreteBytecode.from_code(code_obj, extended_arg=True)
             ann_code = concrete.consts[0]
             func_code = concrete.consts[1]
             self.assertEqual(concrete.names, ["foo"])
-            self.assertEqual(concrete.consts, [ann_code, func_code, None])
+            self.assertEqual(concrete.consts, expected_consts)
             self.assertInstructionListEqual(list(concrete), expected_py315)
             return
         if PY314: