Use atomics when loading oparg

mpage · mpage · commit 1b787b3f7339 · 2024-12-20T09:25:59.000-08:00
diff --git a/Python/specialize.c b/Python/specialize.c
@@ -1127,6 +1127,7 @@ do_specialize_instance_load_attr(PyObject* owner, _Py_CODEUNIT* instr, PyObject*
         SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_OUT_OF_VERSIONS);
         return -1;
     }
+    uint8_t oparg = FT_ATOMIC_LOAD_UINT8_RELAXED(instr->op.arg);
     switch(kind) {
         case OVERRIDING:
             SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_ATTR_OVERRIDING_DESCRIPTOR);
@@ -1136,7 +1137,6 @@ do_specialize_instance_load_attr(PyObject* owner, _Py_CODEUNIT* instr, PyObject*
             if (shadow) {
                 goto try_instance;
             }
-            int oparg = instr->op.arg;
             if (oparg & 1) {
                 if (specialize_attr_loadclassattr(owner, instr, name, descr,
                                                   tp_version, kind, true,
@@ -1166,7 +1166,7 @@ do_specialize_instance_load_attr(PyObject* owner, _Py_CODEUNIT* instr, PyObject*
             if (!function_check_args(fget, 1, LOAD_ATTR)) {
                 return -1;
             }
-            if (instr->op.arg & 1) {
+            if (oparg & 1) {
                 SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_ATTR_METHOD);
                 return -1;
             }
@@ -1243,7 +1243,7 @@ do_specialize_instance_load_attr(PyObject* owner, _Py_CODEUNIT* instr, PyObject*
             if (!function_check_args(descr, 2, LOAD_ATTR)) {
                 return -1;
             }
-            if (instr->op.arg & 1) {
+            if (oparg & 1) {
                 SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_ATTR_METHOD);
                 return -1;
             }
@@ -1280,7 +1280,7 @@ do_specialize_instance_load_attr(PyObject* owner, _Py_CODEUNIT* instr, PyObject*
             if (shadow) {
                 goto try_instance;
             }
-            if ((instr->op.arg & 1) == 0) {
+            if ((oparg & 1) == 0) {
                 if (specialize_attr_loadclassattr(owner, instr, name, descr,
                                                   tp_version, kind, false,
                                                   shared_keys_version)) {

Original file line number	Diff line number	Diff line change
`@@ -1127,6 +1127,7 @@ do_specialize_instance_load_attr(PyObject* owner, _Py_CODEUNIT* instr, PyObject*`
`1127`	`1127`	`SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_OUT_OF_VERSIONS);`
`1128`	`1128`	`return -1;`
`1129`	`1129`	`}`
	`1130`	`+ uint8_t oparg = FT_ATOMIC_LOAD_UINT8_RELAXED(instr->op.arg);`
`1130`	`1131`	`switch(kind) {`
`1131`	`1132`	`case OVERRIDING:`
`1132`	`1133`	`SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_ATTR_OVERRIDING_DESCRIPTOR);`
`@@ -1136,7 +1137,6 @@ do_specialize_instance_load_attr(PyObject* owner, _Py_CODEUNIT* instr, PyObject*`
`1136`	`1137`	`if (shadow) {`
`1137`	`1138`	`goto try_instance;`
`1138`	`1139`	`}`
`1139`		`- int oparg = instr->op.arg;`
`1140`	`1140`	`if (oparg & 1) {`
`1141`	`1141`	`if (specialize_attr_loadclassattr(owner, instr, name, descr,`
`1142`	`1142`	`tp_version, kind, true,`
`@@ -1166,7 +1166,7 @@ do_specialize_instance_load_attr(PyObject* owner, _Py_CODEUNIT* instr, PyObject*`
`1166`	`1166`	`if (!function_check_args(fget, 1, LOAD_ATTR)) {`
`1167`	`1167`	`return -1;`
`1168`	`1168`	`}`
`1169`		`- if (instr->op.arg & 1) {`
	`1169`	`+ if (oparg & 1) {`
`1170`	`1170`	`SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_ATTR_METHOD);`
`1171`	`1171`	`return -1;`
`1172`	`1172`	`}`
`@@ -1243,7 +1243,7 @@ do_specialize_instance_load_attr(PyObject* owner, _Py_CODEUNIT* instr, PyObject*`
`1243`	`1243`	`if (!function_check_args(descr, 2, LOAD_ATTR)) {`
`1244`	`1244`	`return -1;`
`1245`	`1245`	`}`
`1246`		`- if (instr->op.arg & 1) {`
	`1246`	`+ if (oparg & 1) {`
`1247`	`1247`	`SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_ATTR_METHOD);`
`1248`	`1248`	`return -1;`
`1249`	`1249`	`}`
`@@ -1280,7 +1280,7 @@ do_specialize_instance_load_attr(PyObject* owner, _Py_CODEUNIT* instr, PyObject*`
`1280`	`1280`	`if (shadow) {`
`1281`	`1281`	`goto try_instance;`
`1282`	`1282`	`}`
`1283`		`- if ((instr->op.arg & 1) == 0) {`
	`1283`	`+ if ((oparg & 1) == 0) {`
`1284`	`1284`	`if (specialize_attr_loadclassattr(owner, instr, name, descr,`
`1285`	`1285`	`tp_version, kind, false,`
`1286`	`1286`	`shared_keys_version)) {`