https://github.com/python/cpython/commit/b9e88ff4cbf6481578421d58acf2455647cefeb4
commit: b9e88ff4cbf6481578421d58acf2455647cefeb4
branch: main
author: Nadeshiko Manju <m...@manjusaka.me>
committer: Fidget-Spinner <kenjin4...@gmail.com>
date: 2025-04-17T01:17:48+08:00
summary:
gh-131798: Use `sym_new_type` instead of `sym_new_not_null` for `_BUILD_LIST`,
`_BUILD_SLICE`, and `_BUILD_MAP` (GH-132434)
---------
Signed-off-by: Manjusaka <m...@manjusaka.me>
files:
A
Misc/NEWS.d/next/Core_and_Builtins/2025-04-12-19-41-16.gh-issue-131798.JkSocg.rst
M Lib/test/test_capi/test_opt.py
M Python/optimizer_bytecodes.c
M Python/optimizer_cases.c.h
diff --git a/Lib/test/test_capi/test_opt.py b/Lib/test/test_capi/test_opt.py
index c0e771a0d59c4f..34b7c5982245c7 100644
--- a/Lib/test/test_capi/test_opt.py
+++ b/Lib/test/test_capi/test_opt.py
@@ -1678,7 +1678,7 @@ def f(n):
x = 0
for _ in range(n):
d = {}
- d["Spam"] = 1 # Guarded...
+ d["Spam"] = 1 # unguarded!
x += d["Spam"] # ...unguarded!
return x
@@ -1686,7 +1686,7 @@ def f(n):
self.assertEqual(res, TIER2_THRESHOLD)
self.assertIsNotNone(ex)
uops = get_opnames(ex)
- self.assertEqual(uops.count("_GUARD_NOS_DICT"), 1)
+ self.assertEqual(uops.count("_GUARD_NOS_DICT"), 0)
self.assertEqual(uops.count("_STORE_SUBSCR_DICT"), 1)
self.assertEqual(uops.count("_BINARY_OP_SUBSCR_DICT"), 1)
@@ -1695,7 +1695,7 @@ def f(n):
x = 0
for _ in range(n):
l = [0]
- l[0] = 1 # Guarded...
+ l[0] = 1 # unguarded!
[a] = l # ...unguarded!
b = l[0] # ...unguarded!
if l: # ...unguarded!
@@ -1706,7 +1706,7 @@ def f(n):
self.assertEqual(res, 2 * TIER2_THRESHOLD)
self.assertIsNotNone(ex)
uops = get_opnames(ex)
- self.assertEqual(uops.count("_GUARD_NOS_LIST"), 1)
+ self.assertEqual(uops.count("_GUARD_NOS_LIST"), 0)
self.assertEqual(uops.count("_STORE_SUBSCR_LIST_INT"), 1)
self.assertEqual(uops.count("_GUARD_TOS_LIST"), 0)
self.assertEqual(uops.count("_UNPACK_SEQUENCE_LIST"), 1)
diff --git
a/Misc/NEWS.d/next/Core_and_Builtins/2025-04-12-19-41-16.gh-issue-131798.JkSocg.rst
b/Misc/NEWS.d/next/Core_and_Builtins/2025-04-12-19-41-16.gh-issue-131798.JkSocg.rst
new file mode 100644
index 00000000000000..5a9c0cde35fffb
--- /dev/null
+++
b/Misc/NEWS.d/next/Core_and_Builtins/2025-04-12-19-41-16.gh-issue-131798.JkSocg.rst
@@ -0,0 +1,2 @@
+Use ``sym_new_type`` instead of ``sym_new_not_null`` for _BUILD_LIST,
+_BUILD_SET, _BUILD_MAP
diff --git a/Python/optimizer_bytecodes.c b/Python/optimizer_bytecodes.c
index 8e1eacfec83e95..43fe2107bf998a 100644
--- a/Python/optimizer_bytecodes.c
+++ b/Python/optimizer_bytecodes.c
@@ -919,6 +919,18 @@ dummy_func(void) {
tup = sym_new_tuple(ctx, oparg, values);
}
+ op(_BUILD_LIST, (values[oparg] -- list)) {
+ list = sym_new_type(ctx, &PyList_Type);
+ }
+
+ op(_BUILD_SLICE, (values[oparg] -- slice)) {
+ slice = sym_new_type(ctx, &PySlice_Type);
+ }
+
+ op(_BUILD_MAP, (values[oparg*2] -- map)) {
+ map = sym_new_type(ctx, &PyDict_Type);
+ }
+
op(_UNPACK_SEQUENCE_TWO_TUPLE, (seq -- val1, val0)) {
val0 = sym_tuple_getitem(ctx, seq, 0);
val1 = sym_tuple_getitem(ctx, seq, 1);
diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h
index 6a20cef906242b..f51b00d25fe506 100644
--- a/Python/optimizer_cases.c.h
+++ b/Python/optimizer_cases.c.h
@@ -1031,7 +1031,7 @@
case _BUILD_LIST: {
JitOptSymbol *list;
- list = sym_new_not_null(ctx);
+ list = sym_new_type(ctx, &PyList_Type);
stack_pointer[-oparg] = list;
stack_pointer += 1 - oparg;
assert(WITHIN_STACK_BOUNDS());
@@ -1061,7 +1061,7 @@
case _BUILD_MAP: {
JitOptSymbol *map;
- map = sym_new_not_null(ctx);
+ map = sym_new_type(ctx, &PyDict_Type);
stack_pointer[-oparg*2] = map;
stack_pointer += 1 - oparg*2;
assert(WITHIN_STACK_BOUNDS());
@@ -2092,7 +2092,7 @@
case _BUILD_SLICE: {
JitOptSymbol *slice;
- slice = sym_new_not_null(ctx);
+ slice = sym_new_type(ctx, &PySlice_Type);
stack_pointer[-oparg] = slice;
stack_pointer += 1 - oparg;
assert(WITHIN_STACK_BOUNDS());
_______________________________________________
Python-checkins mailing list -- python-checkins@python.org
To unsubscribe send an email to python-checkins-le...@python.org
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: arch...@mail-archive.com
