GH-105848: Simplify the arrangement of CALL's stack (GH-107788)

This commit is contained in:
Brandt Bucher 2023-08-09 11:19:39 -07:00 committed by GitHub
parent 0a7f48b9a8
commit a9caf9cf90
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 627 additions and 682 deletions

View file

@ -273,11 +273,11 @@ _PyOpcode_num_popped(int opcode, int oparg, bool jump) {
case BUILD_CONST_KEY_MAP:
return oparg + 1;
case DICT_UPDATE:
return 1;
return (oparg - 1) + 2;
case DICT_MERGE:
return 1;
return (oparg - 1) + 5;
case MAP_ADD:
return 2;
return (oparg - 1) + 3;
case INSTRUMENTED_LOAD_SUPER_ATTR:
return 3;
case LOAD_SUPER_ATTR:
@ -719,11 +719,11 @@ _PyOpcode_num_pushed(int opcode, int oparg, bool jump) {
case BUILD_CONST_KEY_MAP:
return 1;
case DICT_UPDATE:
return 0;
return (oparg - 1) + 1;
case DICT_MERGE:
return 0;
return (oparg - 1) + 4;
case MAP_ADD:
return 0;
return (oparg - 1) + 1;
case INSTRUMENTED_LOAD_SUPER_ATTR:
return ((oparg & 1) ? 1 : 0) + 1;
case LOAD_SUPER_ATTR:
@ -735,7 +735,7 @@ _PyOpcode_num_pushed(int opcode, int oparg, bool jump) {
case LOAD_ZERO_SUPER_ATTR:
return ((oparg & 1) ? 1 : 0) + 1;
case LOAD_SUPER_ATTR_ATTR:
return ((oparg & 1) ? 1 : 0) + 1;
return 1;
case LOAD_SUPER_ATTR_METHOD:
return 2;
case LOAD_ATTR:
@ -753,9 +753,9 @@ _PyOpcode_num_pushed(int opcode, int oparg, bool jump) {
case LOAD_ATTR_CLASS:
return ((oparg & 1) ? 1 : 0) + 1;
case LOAD_ATTR_PROPERTY:
return ((oparg & 1) ? 1 : 0) + 1;
return 1;
case LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN:
return ((oparg & 1) ? 1 : 0) + 1;
return 1;
case STORE_ATTR_INSTANCE_VALUE:
return 0;
case STORE_ATTR_WITH_HINT: