crosshair-tool 0.0.84__cp38-cp38-macosx_11_0_arm64.whl → 0.0.85__cp38-cp38-macosx_11_0_arm64.whl

crosshair/__init__.py

@@ -15,7 +15,7 @@ from crosshair.statespace import StateSpace
 from crosshair.tracers import NoTracing, ResumedTracing
 from crosshair.util import IgnoreAttempt, debug
 
-__version__ = "0.0.84"  # Do not forget to update in setup.py!
+__version__ = "0.0.85"  # Do not forget to update in setup.py!
 __author__ = "Phillip Schanely"
 __license__ = "MIT"
 __status__ = "Alpha"

crosshair/_mark_stacks.h

@@ -538,31 +538,6 @@ static const uint8_t _ch_DE_INSTRUMENT[256] = {
 #endif
 #endif
 
-static const uint8_t _ch_TRACABLE_INSTRUCTIONS[256] = {
-    // This must be manually kept in sync the the various
-    // instructions that we care about on the python side.
-    [MAP_ADD] = 1,
-    [BINARY_SUBSCR] = 1,
-    [BINARY_SLICE] = 1,
-    [CONTAINS_OP] = 1,
-    [BUILD_STRING] = 1,
-#if PY_VERSION_HEX < 0x030D0000
-    // <= 3.12
-    [FORMAT_VALUE] = 1,
-#elif PY_VERSION_HEX < 0x030E0000
-    // 3.13
-    [CALL_KW] = 1,
-    [CONVERT_VALUE] = 1,
-#endif
-    [UNARY_NOT] = 1,
-    [SET_ADD] = 1,
-    [IS_OP] = 1,
-    [BINARY_OP] = 1,
-    [CALL] = 1,
-    [CALL_FUNCTION_EX] = 1,
-};
-
-
 /* Get the underlying opcode, stripping instrumentation */
 int _ch_Py_GetBaseOpcode(PyCodeObject *code, int i)
 {

crosshair/_tracers.h

@@ -88,4 +88,6 @@ typedef struct TraceSwap {
 
 extern PyTypeObject TraceSwapType;
 
+extern const uint8_t _ch_TRACABLE_INSTRUCTIONS[256];
+
 #endif /* _COVERAGE_TRACER_H */

crosshair/_tracers_test.py

@@ -89,7 +89,10 @@ def _log_execution_stacks(fn, *a, **kw):
     return stacks
 
 
-@pytest.mark.skipif(sys.version_info < (3, 12), reason="stack depth on 3.12+")
+@pytest.mark.skipif(
+    sys.version_info < (3, 12) or sys.version_info >= (3, 14),
+    reason="stack depths only in 3.12 & 3.13",
+)
 def test_one_function_stack_depth():
     _E = (TypeError, KeyboardInterrupt)
 
@@ -100,7 +103,10 @@ def test_one_function_stack_depth():
     _log_execution_stacks(a, 4)
 
 
-@pytest.mark.skipif(sys.version_info < (3, 12), reason="stack depth on 3.12+")
+@pytest.mark.skipif(
+    sys.version_info < (3, 12) or sys.version_info >= (3, 14),
+    reason="stack depths only in 3.12 & 3.13",
+)
 def test_stack_get():
     def to_be_traced(x):
         r = 8 - x

crosshair/condition_parser.py

@@ -47,6 +47,7 @@ from crosshair.options import AnalysisKind
 from crosshair.register_contract import get_contract
 from crosshair.tracers import NoTracing
 from crosshair.util import (
+    CrossHairInternal,
     DynamicScopeVar,
     EvalFriendlyReprContext,
     IdKeyedDict,
@@ -485,6 +486,7 @@ class ConcreteConditionParser(ConditionParser):
             method = cls.__dict__.get(method_name, None)
             super_method_conditions = super_methods.get(method_name)
             if super_method_conditions is not None:
+                # Re-type the super's `self` argument to be this class:
                 revised_sig = set_first_arg_type(super_method_conditions.sig, cls)
                 super_method_conditions = replace(
                     super_method_conditions, sig=revised_sig
@@ -511,17 +513,15 @@ class ConcreteConditionParser(ConditionParser):
             final_pre = list(conditions.pre)
             final_post = list(conditions.post)
             if method_name in (
-                "__new__",  # isn't passed a concrete instance.
+                "__new__",  # a staticmethod, but not isinstance(staticmethod)
                 "__repr__",  # is itself required for reporting problems with invariants.
                 # [set/del]attr can do anything; we can't resonably enforce invariants:
                 "__setattr__",
                 "__delattr__",
+                "__replace__",  # Will raise an exception with most arbitrary **kwargs.
+                "__annotate__",  # a staticmethod, but not isinstance(staticmethod)
             ):
                 pass
-            elif method_name == "__replace__":
-                # TODO: remove this case when fixed in 3.13
-                # see https://github.com/python/cpython/issues/114198
-                pass
             elif method_name == "__del__":
                 final_pre.extend(inv)
             elif method_name == "__init__":

crosshair/condition_parser_test.py

@@ -140,7 +140,7 @@ class TestPep316Parser:
             "self.x >= 0",
             "self.y >= 0",
         }
-        assert set(class_conditions.methods.keys()) == {"isready", "__init__"}
+        assert {"isready", "__init__"} <= set(class_conditions.methods.keys())
         method = class_conditions.methods["isready"]
         assert set([c.expr_source for c in method.pre]) == {
             "self.x >= 0",

crosshair/copyext.py

@@ -1,4 +1,9 @@
-from copy import _deepcopy_atomic  # type: ignore
+import sys
+
+if sys.version_info >= (3, 14):
+    from copy import _atomic_types
+else:
+    from copy import _deepcopy_atomic  # type: ignore
 from copy import _deepcopy_dict  # type: ignore
 from copy import _deepcopy_dispatch  # type: ignore
 from copy import _deepcopy_list  # type: ignore
@@ -9,7 +14,7 @@ from copy import Error
 from copyreg import dispatch_table  # type: ignore
 from enum import Enum
 from types import MappingProxyType
-from typing import Any, Dict, Tuple
+from typing import Any, Callable, Dict, Tuple
 
 from crosshair.tracers import ResumedTracing
 from crosshair.util import (
@@ -85,17 +90,28 @@ def deepcopyext(obj: object, mode: CopyMode, memo: Dict) -> Any:
     return cpy
 
 
+if sys.version_info >= (3, 14):
+
+    def lookup_dispatch(cls: type) -> Callable:
+        if cls in _atomic_types:
+            return lambda obj, memo: obj
+        return _deepcopy_dispatch.get(cls)
+
+else:
+
+    def lookup_dispatch(cls: type) -> Callable:
+        return _deepcopy_dispatch.get(cls)
+
+
 def _deepconstruct(obj: object, mode: CopyMode, memo: Dict):
     cls = type(obj)
 
     def subdeepcopy(obj: object, memo: Dict):
         return deepcopyext(obj, mode, memo)
 
-    if cls in _deepcopy_dispatch:
-        creator = _deepcopy_dispatch[cls]
-        if creator is _deepcopy_atomic:
-            return obj
-        elif creator in (_deepcopy_dict, _deepcopy_list, _deepcopy_tuple):
+    creator = lookup_dispatch(cls)
+    if creator is not None:
+        if creator in (_deepcopy_dict, _deepcopy_list, _deepcopy_tuple):
             return creator(obj, memo, deepcopy=subdeepcopy)
         else:
             # TODO: We loose subdeepcopy in this case - won't

crosshair/copyext_test.py

@@ -7,7 +7,7 @@ import pytest
 from crosshair.copyext import CopyMode, deepcopyext
 from crosshair.core_and_libs import proxy_for_type, standalone_statespace
 from crosshair.libimpl.builtinslib import SymbolicInt
-from crosshair.tracers import NoTracing, ResumedTracing
+from crosshair.tracers import NoTracing
 
 
 def test_deepcopyext_best_effort():
@@ -33,6 +33,16 @@ def test_deepcopyext_symbolic_set():
             deepcopyext(s, CopyMode.REALIZE, {})
 
 
+def test_deepcopyext_realize_simple(space):
+    x = SymbolicInt("x")
+    input = (x,)
+    output = deepcopyext(input, CopyMode.REALIZE, {})
+    assert input is not output
+    assert input[0] is not output[0]
+    assert type(input[0]) is SymbolicInt
+    assert type(output[0]) is int
+
+
 def test_deepcopyext_realize(space):
     x = SymbolicInt("x")
     lock = RLock()

crosshair/dynamic_typing.py

@@ -4,7 +4,7 @@ from inspect import Parameter, Signature
 from itertools import zip_longest
 from typing import Any, Callable, Dict, List, Mapping, Optional, Sequence, Tuple, Type
 
-import typing_inspect
+import typing_inspect  # type: ignore
 
 from crosshair.util import debug  # type: ignore
 

crosshair/fnutil_test.py

@@ -26,7 +26,10 @@ def test_fn_globals_on_builtin() -> None:
 
 def test_resolve_signature_invalid_annotations() -> None:
     sig = resolve_signature(with_invalid_type_annotation)
-    assert sig == "name 'TypeThatIsNotDefined' is not defined"
+    if sys.version_info >= (3, 14):
+        assert sig == "TypeThatIsNotDefined"
+    else:
+        assert sig == "name 'TypeThatIsNotDefined' is not defined"
 
 
 @pytest.mark.skipif(

crosshair/libimpl/arraylib.py

@@ -30,19 +30,6 @@ INT_TYPE_BOUNDS: Dict[str, Tuple[int, int]] = {
 INT_TYPE_SIZE = {c: array(c).itemsize for c in INT_TYPE_BOUNDS.keys()}
 
 
-if sys.version_info >= (3, 12):
-    from collections.abc import Buffer
-
-    def is_bytes_like(obj: object) -> bool:
-        return isinstance(obj, Buffer)
-
-else:
-    from collections.abc import ByteString
-
-    def is_bytes_like(obj: object) -> bool:
-        return isinstance(obj, (ByteString, array))
-
-
 def pick_code(space: StateSpace) -> Tuple[str, int, int]:
     last_idx = len(INT_TYPE_BOUNDS) - 1
     for (idx, (code, rng)) in enumerate(INT_TYPE_BOUNDS.items()):

crosshair/libimpl/builtinslib.py

@@ -17,7 +17,7 @@ from dataclasses import dataclass
 from itertools import zip_longest
 from math import inf, isfinite, isinf, isnan, nan
 from numbers import Integral, Number, Real
-from sys import maxunicode
+from sys import maxunicode, version_info
 from typing import (
     Any,
     BinaryIO,
@@ -58,6 +58,8 @@ try:
 except ImportError:
     from z3 import FfpEQ as fpEQ
 
+import sys
+
 from crosshair.abcstring import AbcString
 from crosshair.core import (
     SymbolicFactory,
@@ -116,6 +118,7 @@ from crosshair.util import (
     assert_tracing,
     ch_stack,
     debug,
+    is_bytes_like,
     is_hashable,
     is_iterable,
     memo,
@@ -1213,10 +1216,11 @@ class SymbolicInt(SymbolicIntable, AtomicSymbolicValue):
         cur_divisor = 10
         while True:
             leftover = self // cur_divisor
-            if leftover == 0:
+            if leftover != 0:
+                codepoints.append(48 + (leftover % 10))
+                cur_divisor *= 10
+            else:
                 break
-            codepoints.append(48 + (leftover % 10))
-            cur_divisor *= 10
         with NoTracing():
             codepoints.reverse()
             return LazyIntSymbolicStr(codepoints)
@@ -1316,7 +1320,7 @@ class SymbolicInt(SymbolicIntable, AtomicSymbolicValue):
                 z3.If(val < 128, 7, 8)))))))))
             # fmt: on
 
-    if sys.version_info >= (3, 12):
+    if version_info >= (3, 12):
 
         def is_integer(self):
             return True
@@ -2934,7 +2938,7 @@ class AnySymbolicStr(AbcString):
     def capitalize(self):
         if self.__len__() == 0:
             return ""
-        if sys.version_info >= (3, 8):
+        if version_info >= (3, 8):
             firstchar = self[0].title()
         else:
             firstchar = self[0].upper()
@@ -3172,7 +3176,7 @@ class AnySymbolicStr(AbcString):
         return ""
 
     def splitlines(self, keepends=False):
-        if sys.version_info < (3, 12):
+        if version_info < (3, 12):
             if not isinstance(keepends, int):
                 raise TypeError
         mylen = self.__len__()
@@ -3438,6 +3442,7 @@ class LazyIntSymbolicStr(AnySymbolicStr, CrossHairValue):
                 SliceView,
                 SequenceConcatenation,
                 list,  # TODO: are we sharing mutable state here?
+                tuple,
             ),
         ):
             self._codepoints = smtvar
@@ -3975,7 +3980,7 @@ class BytesLike(Buffer, AbcString, CrossHairValue):
             return False
         return list(self) == list(other)
 
-    if sys.version_info >= (3, 12):
+    if version_info >= (3, 12):
 
         def __buffer__(self, flags: int):
             with NoTracing():
@@ -4135,7 +4140,10 @@ class SymbolicBytes(BytesLike):
         accumulated = []
         high = None
         if not isinstance(hexstr, str):
-            raise TypeError
+            if is_bytes_like(hexstr) and version_info >= (3, 14):
+                hexstr = LazyIntSymbolicStr(tuple(hexstr))
+            else:
+                raise TypeError
         for idx, ch in enumerate(hexstr):
             if not ch.isascii():
                 raise ValueError(
@@ -4894,7 +4902,7 @@ def _int_from_bytes(
 ) -> int:
     if byteorder is _MISSING:
         # byteorder defaults to "big" as of 3.11
-        if sys.version_info >= (3, 11):
+        if version_info >= (3, 11):
             byteorder = "big"
         else:
             raise TypeError
@@ -5108,7 +5116,7 @@ def make_registrations():
 
     register_type(Union, make_union_choice)
 
-    if sys.version_info >= (3, 8):
+    if version_info >= (3, 8):
         from typing import Final
 
         register_type(Final, lambda p, t: p(t))
@@ -5266,7 +5274,7 @@ def make_registrations():
         "upper",
         "zfill",
     ]
-    if sys.version_info >= (3, 9):
+    if version_info >= (3, 9):
         names_to_str_patch.append("removeprefix")
         names_to_str_patch.append("removesuffix")
     for name in names_to_str_patch:
@@ -5322,12 +5330,12 @@ def make_registrations():
     # Patches on int
     register_patch(int.__repr__, with_checked_self(int, "__repr__"))
     register_patch(int.as_integer_ratio, with_checked_self(int, "as_integer_ratio"))
-    if sys.version_info >= (3, 10):
+    if version_info >= (3, 10):
         register_patch(int.bit_count, with_checked_self(int, "bit_count"))
     register_patch(int.bit_length, with_checked_self(int, "bit_length"))
     register_patch(int.conjugate, with_checked_self(int, "conjugate"))
     register_patch(int.from_bytes, _int_from_bytes)
-    if sys.version_info >= (3, 12):
+    if version_info >= (3, 12):
         register_patch(int.is_integer, with_checked_self(int, "is_integer"))
     register_patch(int.to_bytes, with_checked_self(int, "to_bytes"))
 

crosshair/libimpl/collectionslib.py

@@ -126,8 +126,19 @@ class ListBasedDeque(collections.abc.MutableSequence, CrossHairValue, Generic[T]
         prefix.reverse()
         self._contents = prefix + self._contents
 
-    def index(self, item: T, *bounds) -> int:
-        return self._contents.index(item, *bounds)
+    if sys.version_info >= (3, 14):
+
+        def index(self, item: T, *bounds) -> int:
+            try:
+                return self._contents.index(item, *bounds)
+            except ValueError as exc:
+                exc.args = ("deque.index(x): x not in deque",)
+                raise
+
+    else:
+
+        def index(self, item: T, *bounds) -> int:
+            return self._contents.index(item, *bounds)
 
     def insert(self, index: int, item: T) -> None:
         self._contents.insert(index, item)

crosshair/libimpl/collectionslib_test.py

@@ -1,3 +1,4 @@
+import re
 import sys
 from collections import Counter, defaultdict, deque, namedtuple
 from copy import deepcopy
@@ -98,7 +99,11 @@ def test_deque_index_with_start_index_throws_correct_exception(test_list) -> Non
     with pytest.raises(ValueError) as context:
         test_list.index(1, 2)
 
-    assert context.match("1 is not in list")
+    if sys.version_info >= (3, 14):
+        # assert context.match(re.escape("list.index(x): x not in list"))
+        assert context.match(re.escape("deque.index(x): x not in deque"))
+    else:
+        assert context.match("1 is not in list")
 
 
 def test_deque_index_with_start_and_end_index(test_list) -> None:
@@ -112,7 +117,10 @@ def test_deque_index_with_start_and_end_index_throws_correct_exception(
     with pytest.raises(ValueError) as context:
         test_list.index(6, 0, 1)
 
-    assert context.match("6 is not in list")
+    if sys.version_info >= (3, 14):
+        assert context.match(re.escape("deque.index(x): x not in deque"))
+    else:
+        assert context.match("6 is not in list")
 
 
 def test_deque_insert(test_list) -> None:

crosshair/libimpl/timelib.py

@@ -1,27 +1,45 @@
 import time as real_time
 from inspect import Signature
 from math import isfinite
-from typing import Any, Callable
+from typing import Any, Literal
 
-from crosshair.core import FunctionInterps
+from crosshair.core import register_patch
 from crosshair.register_contract import register_contract
 from crosshair.statespace import context_statespace
 from crosshair.tracers import NoTracing
 
 
-def _gte_last(fn: Callable, value: Any) -> bool:
+class EarliestPossibleTime:
+    monotonic: float = 0.0
+    process_time: float = 0.0
+
+    def __init__(self, *a):
+        pass
+
+
+# Imprecision at high values becomes a sort of artificial problem
+_UNREALISTICALLY_LARGE_TIME_FLOAT = float(60 * 60 * 24 * 365 * 100_000)
+
+
+def _gte_last(kind: Literal["monotonic", "process_time"], value: Any) -> bool:
+    with NoTracing():
+        earliest_times = context_statespace().extra(EarliestPossibleTime)
+        threshold = getattr(earliest_times, kind)
+        setattr(earliest_times, kind, value)
+    return all([threshold <= value, value < _UNREALISTICALLY_LARGE_TIME_FLOAT])
+
+
+def _sleep(value: float) -> None:
     with NoTracing():
-        interps = context_statespace().extra(FunctionInterps)
-        previous = interps._interpretations[fn]
-        if len(previous) < 2:
-            return True
-    return value >= previous[-2]
+        earliest_times = context_statespace().extra(EarliestPossibleTime)
+    earliest_times.monotonic += value
+    return None
 
 
 def make_registrations():
     register_contract(
         real_time.time,
-        post=lambda __return__: __return__ > 0.0,
+        post=lambda __return__: __return__ > 0.0 and isfinite(__return__),
         sig=Signature(parameters=[], return_annotation=float),
     )
     register_contract(
@@ -31,23 +49,24 @@ def make_registrations():
     )
     register_contract(
         real_time.monotonic,
-        post=lambda __return__: isfinite(__return__)
-        and _gte_last(real_time.monotonic, __return__),
+        post=lambda __return__: _gte_last("monotonic", __return__)
+        and isfinite(__return__),
         sig=Signature(parameters=[], return_annotation=float),
     )
     register_contract(
         real_time.monotonic_ns,
-        post=lambda __return__: isfinite(__return__)
-        and _gte_last(real_time.monotonic_ns, __return__),
+        post=lambda __return__: _gte_last("monotonic", __return__ / 1_000_000_000),
         sig=Signature(parameters=[], return_annotation=int),
     )
     register_contract(
         real_time.process_time,
-        post=lambda __return__: _gte_last(real_time.process_time, __return__),
+        post=lambda __return__: _gte_last("process_time", __return__)
+        and isfinite(__return__),
         sig=Signature(parameters=[], return_annotation=float),
     )
     register_contract(
         real_time.process_time_ns,
-        post=lambda __return__: _gte_last(real_time.process_time_ns, __return__),
+        post=lambda __return__: _gte_last("process_time", __return__ / 1_000_000_000),
         sig=Signature(parameters=[], return_annotation=int),
     )
+    register_patch(real_time.sleep, _sleep)

crosshair/libimpl/timelib_test.py

@@ -2,7 +2,7 @@ import time
 
 import pytest
 
-from crosshair.statespace import CONFIRMED, POST_FAIL
+from crosshair.statespace import CANNOT_CONFIRM, CONFIRMED, POST_FAIL
 from crosshair.test_util import check_states
 
 
@@ -69,4 +69,14 @@ def test_monotonic_ns():
         start = time.monotonic_ns()
         return time.monotonic_ns() - start
 
-    check_states(f, CONFIRMED)
+    check_states(f, CANNOT_CONFIRM)
+
+
+def test_sleep():
+    def f():
+        """post: _ >= 60.0"""
+        start = time.monotonic()
+        time.sleep(60.01)
+        return time.monotonic() - start
+
+    check_states(f, CANNOT_CONFIRM)

crosshair/lsp_server.py

@@ -86,7 +86,7 @@ def publish_messages(
             if message.state < MessageType.PRE_UNSAT:
                 continue
             # TODO: consider server.show_message_log()ing the long description
-            diagnostics.append(get_diagnostic(message, doc.lines if doc else ()))
+            diagnostics.append(get_diagnostic(message, doc.lines if doc else []))
         server.publish_diagnostics(uri, diagnostics)
         if not diagnostics:
             # After we publish an empty set, it's safe to forget about the file:

crosshair/opcode_intercept.py

@@ -26,10 +26,10 @@ from crosshair.tracers import (
     frame_stack_read,
     frame_stack_write,
 )
-from crosshair.util import CrossHairInternal, CrossHairValue
+from crosshair.util import CROSSHAIR_EXTRA_ASSERTS, CrossHairInternal, CrossHairValue
 from crosshair.z3util import z3Not, z3Or
 
-BINARY_SUBSCR = dis.opmap["BINARY_SUBSCR"]
+BINARY_SUBSCR = dis.opmap.get("BINARY_SUBSCR", 256)
 BINARY_SLICE = dis.opmap.get("BINARY_SLICE", 256)
 BUILD_STRING = dis.opmap["BUILD_STRING"]
 COMPARE_OP = dis.opmap["COMPARE_OP"]
@@ -61,11 +61,17 @@ _DEEPLY_CONCRETE_KEY_TYPES = (
 
 
 class SymbolicSubscriptInterceptor(TracingModule):
-    opcodes_wanted = frozenset([BINARY_SUBSCR])
+    opcodes_wanted = frozenset([BINARY_SUBSCR, BINARY_OP])
 
     def trace_op(self, frame, codeobj, codenum):
         # Note that because this is called from inside a Python trace handler, tracing
         # is automatically disabled, so there's no need for a `with NoTracing():` guard.
+
+        if codenum == BINARY_OP:
+            oparg = frame_op_arg(frame)
+            if oparg != 26:  # subscript operator, NB_SUBSCR
+                return
+
         key = frame_stack_read(frame, -1)
         if isinstance(key, _DEEPLY_CONCRETE_KEY_TYPES):
             return
@@ -345,7 +351,9 @@ class MapAddInterceptor(TracingModule):
         # Afterwards, overwrite the interpreter's resulting dict with ours:
         def post_op():
             old_dict_obj = frame_stack_read(frame, dict_offset + 2)
-            if not isinstance(old_dict_obj, (dict, MutableMapping)):
+            if CROSSHAIR_EXTRA_ASSERTS and not isinstance(
+                old_dict_obj, (dict, MutableMapping)
+            ):
                 raise CrossHairInternal("interpreter stack corruption detected")
             frame_stack_write(frame, dict_offset + 2, dict_obj)
 
@@ -427,7 +435,8 @@ class SetAddInterceptor(TracingModule):
                 # Set and value are concrete; continue as normal.
                 return
         # Have the interpreter do a fake addition, namely `set().add(1)`
-        frame_stack_write(frame, set_offset, set())
+        dummy_set: Set = set()
+        frame_stack_write(frame, set_offset, dummy_set)
         frame_stack_write(frame, -1, 1)
 
         # And do our own addition separately:
@@ -435,6 +444,12 @@ class SetAddInterceptor(TracingModule):
 
         # Later, overwrite the interpreter's result with ours:
         def post_op():
+            if CROSSHAIR_EXTRA_ASSERTS:
+                to_replace = frame_stack_read(frame, set_offset + 1)
+                if to_replace is not dummy_set:
+                    raise CrossHairInternal(
+                        f"Found an instance of {type(to_replace)} where dummy set should be."
+                    )
             frame_stack_write(frame, set_offset + 1, set_obj)
 
         COMPOSITE_TRACER.set_postop_callback(post_op, frame)
@@ -450,9 +465,9 @@ class IdentityInterceptor(TracingModule):
     def trace_op(self, frame: FrameType, codeobj: CodeType, codenum: int) -> None:
         arg1 = frame_stack_read(frame, -1)
         arg2 = frame_stack_read(frame, -2)
-        if isinstance(arg1, SymbolicBool):
+        if isinstance(arg1, SymbolicBool) and isinstance(arg2, (bool, SymbolicBool)):
             frame_stack_write(frame, -1, arg1.__ch_realize__())
-        if isinstance(arg2, SymbolicBool):
+        if isinstance(arg2, SymbolicBool) and isinstance(arg1, (bool, SymbolicBool)):
             frame_stack_write(frame, -2, arg2.__ch_realize__())
 
 
@@ -467,7 +482,7 @@ class ModuloInterceptor(TracingModule):
         if isinstance(left, str):
             if codenum == BINARY_OP:
                 oparg = frame_op_arg(frame)
-                if oparg != 6:  # modulo operator (determined experimentally)
+                if oparg != 6:  # modulo operator, NB_REMAINDER
                     return
             frame_stack_write(frame, -2, DeoptimizedPercentFormattingStr(left))