mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-25 11:15:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

GH-116422: Factor out eval breaker checks at end of calls into its own micro-op. (GH-116817)

Browse source
This commit is contained in:
Mark Shannon 2024-03-14 16:31:47 +00:00 • committed by GitHub
parent 19c3a2ff91
commit 61e54bfcee
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 474 additions and 371 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Python/executor_cases.c.h generated
View file

@ -2819,6 +2819,11 @@
/* _CALL is not a viable micro-op for tier 2 */
case _CHECK_PERIODIC: {
CHECK_EVAL_BREAKER();
break;
}
case _CHECK_CALL_BOUND_METHOD_EXACT_ARGS: {
PyObject *null;
PyObject *callable;
@ -3096,7 +3101,6 @@
if (res == NULL) goto pop_3_error_tier_two;
stack_pointer[-3] = res;
stack_pointer += -2;
CHECK_EVAL_BREAKER();
break;
}
@ -3118,7 +3122,6 @@
if (res == NULL) goto pop_3_error_tier_two;
stack_pointer[-3] = res;
stack_pointer += -2;
CHECK_EVAL_BREAKER();
break;
}
@ -3165,7 +3168,6 @@
if (res == NULL) { stack_pointer += -2 - oparg; goto error_tier_two; }
stack_pointer[-2 - oparg] = res;
stack_pointer += -1 - oparg;
CHECK_EVAL_BREAKER();
break;
}
@ -3203,7 +3205,6 @@
if (res == NULL) { stack_pointer += -2 - oparg; goto error_tier_two; }
stack_pointer[-2 - oparg] = res;
stack_pointer += -1 - oparg;
CHECK_EVAL_BREAKER();
break;
}
@ -3238,14 +3239,8 @@
}
Py_DECREF(callable);
if (res == NULL) { stack_pointer += -2 - oparg; goto error_tier_two; }
/* Not deopting because this doesn't mean our optimization was
wrong. `res` can be NULL for valid reasons. Eg. getattr(x,
'invalid'). In those cases an exception is set, so we must
handle it.
*/
stack_pointer[-2 - oparg] = res;
stack_pointer += -1 - oparg;
CHECK_EVAL_BREAKER();
break;
}
@ -3281,7 +3276,6 @@
if (res == NULL) { stack_pointer += -2 - oparg; goto error_tier_two; }
stack_pointer[-2 - oparg] = res;
stack_pointer += -1 - oparg;
CHECK_EVAL_BREAKER();
break;
}
@ -3393,7 +3387,6 @@
if (res == NULL) { stack_pointer += -2 - oparg; goto error_tier_two; }
stack_pointer[-2 - oparg] = res;
stack_pointer += -1 - oparg;
CHECK_EVAL_BREAKER();
break;
}
@ -3432,7 +3425,6 @@
if (res == NULL) { stack_pointer += -2 - oparg; goto error_tier_two; }
stack_pointer[-2 - oparg] = res;
stack_pointer += -1 - oparg;
CHECK_EVAL_BREAKER();
break;
}
@ -3473,7 +3465,6 @@
if (res == NULL) { stack_pointer += -2 - oparg; goto error_tier_two; }
stack_pointer[-2 - oparg] = res;
stack_pointer += -1 - oparg;
CHECK_EVAL_BREAKER();
break;
}
@ -3512,7 +3503,6 @@
if (res == NULL) { stack_pointer += -2 - oparg; goto error_tier_two; }
stack_pointer[-2 - oparg] = res;
stack_pointer += -1 - oparg;
CHECK_EVAL_BREAKER();
break;
}