Skip to content

Commit d7c1c61

Browse files
committed
rebase, regen, and apply Guido's suggestion
1 parent b55a4a3 commit d7c1c61

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

Python/bytecodes.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -515,9 +515,7 @@ dummy_func(
515515
exc = args[0];
516516
/* fall through */
517517
case 0:
518-
if (do_raise(tstate, exc, cause)) {
519-
ERROR_IF(true, exception_unwind);
520-
}
518+
ERROR_IF(do_raise(tstate, exc, cause), exception_unwind);
521519
break;
522520
default:
523521
_PyErr_SetString(tstate, PyExc_SystemError,

Python/generated_cases.c.h

+1-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Python/opcode_metadata.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ _PyOpcode_num_popped(int opcode, int oparg) {
8686
case CALL_INTRINSIC_1:
8787
return 1;
8888
case RAISE_VARARGS:
89-
return -1;
89+
return oparg;
9090
case INTERPRETER_EXIT:
9191
return 1;
9292
case RETURN_VALUE:
@@ -430,7 +430,7 @@ _PyOpcode_num_pushed(int opcode, int oparg) {
430430
case CALL_INTRINSIC_1:
431431
return 1;
432432
case RAISE_VARARGS:
433-
return -1;
433+
return 0;
434434
case INTERPRETER_EXIT:
435435
return 0;
436436
case RETURN_VALUE:

0 commit comments

Comments
 (0)