Skip to content

Commit 6968839

Browse files
authored
Merge branch 'main' into fixstdinandcmd
2 parents 0529cec + 665d280 commit 6968839

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

Doc/library/stdtypes.rst

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,10 @@ Any object can be tested for truth value, for use in an :keyword:`if` or
4646
By default, an object is considered true unless its class defines either a
4747
:meth:`~object.__bool__` method that returns ``False`` or a
4848
:meth:`~object.__len__` method that
49-
returns zero, when called with the object. [1]_ Here are most of the built-in
50-
objects considered false:
49+
returns zero, when called with the object. [1]_ If one of the methods raises an
50+
exception when called, the exception is propagated and the object does
51+
not have a truth value (for example, :data:`NotImplemented`).
52+
Here are most of the built-in objects considered false:
5153

5254
.. index::
5355
single: None (Built-in object)
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add missing terminator in certain cases when tracing in the new JIT compiler.

Python/optimizer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -710,7 +710,7 @@ _PyJit_translate_single_bytecode_to_trace(
710710
}
711711

712712
if (!_tstate->jit_tracer_state.prev_state.dependencies_still_valid) {
713-
goto done;
713+
goto full;
714714
}
715715

716716
// This happens when a recursive call happens that we can't trace. Such as Python -> C -> Python calls

0 commit comments

Comments
 (0)