crosshair-tool 0.0.86__cp310-cp310-musllinux_1_2_i686.whl → 0.0.88__cp310-cp310-musllinux_1_2_i686.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.86"  # Do not forget to update in setup.py!
+__version__ = "0.0.88"  # Do not forget to update in setup.py!
 __author__ = "Phillip Schanely"
 __license__ = "MIT"
 __status__ = "Alpha"

crosshair/_mark_stacks.h

@@ -538,23 +538,6 @@ static const uint8_t _ch_DE_INSTRUMENT[256] = {
 #endif
 #endif
 
-/* Get the underlying opcode, stripping instrumentation */
-int _ch_Py_GetBaseOpcode(PyCodeObject *code, int i)
-{
-    int opcode = _PyCode_CODE(code)[i].op.code;
-    if (opcode == INSTRUMENTED_LINE) {
-        opcode = code->_co_monitoring->lines[i].original_opcode;
-    }
-    if (opcode == INSTRUMENTED_INSTRUCTION) {
-        opcode = code->_co_monitoring->per_instruction_opcodes[i];
-    }
-    int deinstrumented = _ch_DE_INSTRUMENT[opcode];
-    if (deinstrumented) {
-        return deinstrumented;
-    }
-    return _ch_PyOpcode_Deopt[opcode];
-}
-
 static int64_t *
 _ch_mark_stacks(PyCodeObject *code_obj, int len)
 {
@@ -602,14 +585,14 @@ _ch_mark_stacks(PyCodeObject *code_obj, int len)
         /* Scan instructions */
         for (i = 0; i < len;) {
             int64_t next_stack = stacks[i];
-            opcode = _ch_Py_GetBaseOpcode(code_obj, i);
+            opcode = code[i].op.code;
             uint8_t trace_enabled_here = _ch_TRACABLE_INSTRUCTIONS[opcode];
             enabled_tracing[i] |= trace_enabled_here;
             int oparg = 0;
             while (opcode == EXTENDED_ARG) {
                 oparg = (oparg << 8) | code[i].op.arg;
                 i++;
-                opcode = _ch_Py_GetBaseOpcode(code_obj, i);
+                opcode = code[i].op.code;
                 stacks[i] = next_stack;
             }
             int next_i = i + _ch_PyOpcode_Caches[opcode] + 1;

crosshair/_tracers.h

@@ -50,10 +50,11 @@ typedef struct HandlerTable {
 } HandlerTable;
 
 
-typedef struct FrameAndCallback {
-    PyObject* frame;
+typedef struct FrameNextIandCallback {
+    PyFrameObject* frame;
+    int expected_i;
     PyObject* callback;
-} FrameAndCallback;
+} FrameNextIandCallback;
 
 
 typedef struct CodeAndStacks {
@@ -62,7 +63,7 @@ typedef struct CodeAndStacks {
 } CodeAndStacks;
 
 
-DEFINE_VEC(FrameAndCallbackVec, FrameAndCallback, init_framecbvec, push_framecb);
+DEFINE_VEC(FrameNextIandCallbackVec, FrameNextIandCallback, init_framecbvec, push_framecb);
 DEFINE_VEC(ModuleVec, PyObject*, init_modulevec, push_module);
 DEFINE_VEC(TableVec, HandlerTable, init_tablevec, push_table_entry)
 
@@ -70,7 +71,7 @@ typedef struct CTracer {
     PyObject_HEAD
     ModuleVec modules;
     TableVec handlers;
-    FrameAndCallbackVec postop_callbacks;
+    FrameNextIandCallbackVec postop_callbacks;
     BOOL enabled;
     BOOL handling;
     BOOL trace_all_opcodes;

crosshair/auditwall.py

@@ -1,4 +1,5 @@
 import importlib
+import inspect
 import os
 import sys
 import traceback
@@ -28,9 +29,10 @@ def reject(event: str, args: Tuple) -> None:
 
 
 def inside_module(modules: Iterable[ModuleType]) -> bool:
-    files = {m.__file__ for m in modules}
-    for frame, lineno in traceback.walk_stack(None):
-        if frame.f_code.co_filename in files:
+    """Checks whether the current call stack is inside one of the given modules."""
+    for frame, _lineno in traceback.walk_stack(None):
+        frame_module = inspect.getmodule(frame)
+        if frame_module and frame_module in modules:
             return True
     return False
 
@@ -60,7 +62,7 @@ def check_msvcrt_open(event: str, args: Tuple) -> None:
 _MODULES_THAT_CAN_POPEN: Optional[Set[ModuleType]] = None
 
 
-def modules_with_allowed_popen():
+def modules_with_allowed_subprocess():
     global _MODULES_THAT_CAN_POPEN
     if _MODULES_THAT_CAN_POPEN is None:
         allowed_module_names = ("_aix_support", "ctypes", "platform", "uuid")
@@ -74,13 +76,14 @@ def modules_with_allowed_popen():
 
 
 def check_subprocess(event: str, args: Tuple) -> None:
-    if not inside_module(modules_with_allowed_popen()):
+    if not inside_module(modules_with_allowed_subprocess()):
         reject(event, args)
 
 
 _SPECIAL_HANDLERS = {
     "open": check_open,
     "subprocess.Popen": check_subprocess,
+    "os.posix_spawn": check_subprocess,
     "msvcrt.open_osfhandle": check_msvcrt_open,
 }
 

crosshair/libimpl/builtinslib.py

@@ -267,7 +267,7 @@ class SymbolicValue(CrossHairValue):
         self.snapshot = SnapshotRef(-1)
         self.python_type = typ
         if type(smtvar) is str:
-            self.var = self.__init_var__(typ, smtvar)
+            self.var: Any = self.__init_var__(typ, smtvar)
         else:
             self.var = smtvar
             # TODO test that smtvar's sort matches expected?
@@ -838,19 +838,6 @@ def setup_binops():
 
     setup_binop(_, {ops.lshift, ops.rshift})
 
-    _AND_MASKS_TO_MOD = {
-        # It's common to use & to mask low bits. We can avoid realization by converting
-        # these situations into mod operations.
-        0x01: 2,
-        0x03: 4,
-        0x07: 8,
-        0x0F: 16,
-        0x1F: 32,
-        0x3F: 64,
-        0x7F: 128,
-        0xFF: 256,
-    }
-
     def _(op: BinFn, a: Integral, b: Integral):
         with NoTracing():
             if isinstance(b, SymbolicInt):
@@ -861,9 +848,12 @@ def setup_binops():
             b = realize(b)
             if b == 0:
                 return 0
-            mask_mod = _AND_MASKS_TO_MOD.get(b)
-            if mask_mod and isinstance(a, SymbolicInt):
-                if context_statespace().smt_fork(a.var >= 0, probability_true=0.75):
+            # It's common to use & to mask low bits. We can avoid realization by converting
+            # these situations into mod operations.
+            mask_mod = b + 1
+            if b > 0 and mask_mod & b == 0 and isinstance(a, SymbolicInt):  # type: ignore
+                space = context_statespace()
+                if space.smt_fork(a.var >= 0, probability_true=0.75):
                     return SymbolicInt(a.var % mask_mod)
                 else:
                     return SymbolicInt(b - ((-a.var - 1) % mask_mod))
@@ -1435,6 +1425,10 @@ class PreciseIeeeSymbolicFloat(SymbolicFloat):
     # __hash__ has to be explicitly reassigned because we define __eq__
     __hash__ = SymbolicFloat.__hash__
 
+    def __bool__(self):
+        with NoTracing():
+            return not SymbolicBool(z3.fpIsZero(self.var))
+
     def __ne__(self, other):
         with NoTracing():
             coerced = type(self)._coerce_to_smt_sort(other)

crosshair/libimpl/builtinslib_test.py

@@ -85,7 +85,6 @@ from crosshair.util import (
     CrossHairValue,
     IgnoreAttempt,
     UnknownSatisfiability,
-    set_debug,
 )
 
 
@@ -3618,18 +3617,29 @@ def test_deep_realization(space, typ):
         assert concrete == symbolic
 
 
-def TODO_test_float_precision_issues(a, b):
-    # Does not yet work: floating point is modeled with infinite precision at the moment
-    def f(a: int, b: int):
-        """
-        pre: b !=0
-        post: a == b * _
+def test_float_round_to_zero(space):
+    space.extra(ModelingDirector).global_representations[
+        float
+    ] = PreciseIeeeSymbolicFloat
+    n = proxy_for_type(float, "n")
+    d = proxy_for_type(float, "d")
+    with ResumedTracing():
+        space.add(d != 0.0)
+        # This is possible for floats, but not reals:
+        assert space.is_possible(n / d != 0.0)
+        assert space.is_possible(n / d == 0.0)
 
-        Postcondition holds in a math-sense, but not when floating point precision
-        comes into play (e.g. it's false for 13 / 99)
-        """
 
-    return a / b
+def test_float_neg_zero_is_falsey(space):
+    space.extra(ModelingDirector).global_representations[
+        float
+    ] = PreciseIeeeSymbolicFloat
+    x = proxy_for_type(float, "x")
+    with ResumedTracing():
+        space.add(x == -10.0)
+        negzero = x / math.inf
+        assert not space.is_possible(negzero != 0.0)
+        assert bool(negzero) is False
 
 
 def TODO_test_int_mod_float():

crosshair/libimpl/copylib_test.py

@@ -0,0 +1,18 @@
+import copy
+import datetime
+
+from crosshair.core import proxy_for_type
+from crosshair.statespace import StateSpace
+from crosshair.tracers import ResumedTracing
+from crosshair.util import debug
+
+
+def test_date_copy(space: StateSpace) -> None:
+    concrete_date = datetime.date(2000, 2, 3)
+    symbolic_date = proxy_for_type(datetime.date, "d")
+    with ResumedTracing():
+        copied_symbolic = copy.deepcopy(symbolic_date)
+        copied_concrete = copy.deepcopy(concrete_date)
+        assert not space.is_possible(copied_concrete != concrete_date)
+        assert not space.is_possible(copied_concrete != datetime.date(2000, 2, 3))
+        assert not space.is_possible(copied_symbolic != symbolic_date)

crosshair/libimpl/datetimelib.py

@@ -855,7 +855,7 @@ class date:
 
     """
 
-    def __init__(self, year, month, day):
+    def __init__(self, year, month=None, day=None):
         """
         Constructor.
 
@@ -863,7 +863,13 @@ class date:
         :param month: month, starting at 1
         :param day: day, starting at 1
         """
-        year, month, day = _check_date_fields(year, month, day)
+        if month is None:
+            # We can receive a string/bytes single argument when unpickling a concrete date
+            with NoTracing():
+                dt = real_date(realize(year))  # type: ignore
+                year, month, day = dt.year, dt.month, dt.day
+        else:
+            year, month, day = _check_date_fields(year, month, day)
         self._year = year
         self._month = month
         self._day = day

crosshair/main_test.py

@@ -515,7 +515,7 @@ def test_mypycrosshair_command():
         capture_output=True,
         text=True,
     )
-    assert completion.stderr.strip() == ""
+    assert completion.stderr.strip() == "", f"stderr was '''{completion.stderr}'''"
     if completion.returncode != 1:
         print(completion.stdout)
         assert False, f"Return code was {completion.returncode}"

crosshair/opcode_intercept_test.py

@@ -286,3 +286,19 @@ def test_identity_operator_does_not_realize_on_differing_types():
         fourty_two = 42  # assignment just to avoid lint errors
         b1 is fourty_two
         assert len(space.choices_made) == choices_made_at_start
+
+
+class IExplodeOnRepr:
+    def __repr__(self):
+        raise ValueError("boom")
+
+
+def test_postop_callback_skipped_on_exception_handler_jump(space):
+    with ResumedTracing():
+        elements = IExplodeOnRepr()
+        try:
+            ret = f"these are them: {elements!r}"
+        except ValueError:  # pragma: no cover
+            ret = None
+        # need to do something(anything) with elements so that it's on the stack:
+        type(elements)

{crosshair_tool-0.0.86.dist-info → crosshair_tool-0.0.88.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: crosshair-tool
-Version: 0.0.86
+Version: 0.0.88
 Summary: Analyze Python code for correctness using symbolic execution.
 Home-page: https://github.com/pschanely/CrossHair
 Author: Phillip Schanely
@@ -46,7 +46,7 @@ Requires-Dist: pytest-xdist; extra == "dev"
 Requires-Dist: setuptools; extra == "dev"
 Requires-Dist: sphinx>=3.4.3; extra == "dev"
 Requires-Dist: sphinx-rtd-theme>=0.5.1; extra == "dev"
-Requires-Dist: wheel; extra == "dev"
+Requires-Dist: rst2pdf>=0.102; extra == "dev"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{crosshair_tool-0.0.86.dist-info → crosshair_tool-0.0.88.dist-info}/RECORD

@@ -1,13 +1,13 @@
-_crosshair_tracers.cpython-310-i386-linux-gnu.so,sha256=wKwyotgRlemS4xhKcplMCMkcm0fpfbPqj8eRdz3crro,62624
-crosshair/__init__.py,sha256=BqE2fB9um9PltLa0yX7EVsyAzVpgDe5EBvIiEhQ2exI,936
+_crosshair_tracers.cpython-310-i386-linux-gnu.so,sha256=JapjipqN6_uKVSUFhoJjDrRyh8r9_1HeEj9K453ZWAs,62796
+crosshair/__init__.py,sha256=SSP_9GXeo_0ypAR-f-Zt32yVGvXY3tEY9SWKDgy_m_A,936
 crosshair/__main__.py,sha256=zw9Ylf8v2fGocE57o4FqvD0lc7U4Ld2GbeCGxRWrpqo,252
-crosshair/_mark_stacks.h,sha256=rvIET5OGjKMcUZxEtIb9RhxRDveAfPXb3HLZZWfM3Bs,29261
+crosshair/_mark_stacks.h,sha256=j86qubOUvVhoR19d74iQ084RrTEq8M6oT4wJsGQUySY,28678
 crosshair/_preliminaries_test.py,sha256=r2PohNNMfIkDqsnvI6gKlJTbwBaZA9NQJueQfJMN2Eo,504
-crosshair/_tracers.h,sha256=qaDWd-_eCZckSbezrXXst6lppzFiM2kD2AcZgvVQm18,2124
+crosshair/_tracers.h,sha256=QFBklLqMWmIpUzBIn_A4SKdpjwHs-N7ttx-F5jtWWCQ,2174
 crosshair/_tracers_pycompat.h,sha256=6IYnbQxrYkhBsLDAHSX25DPOwo1oYHCZUVWZ8c7YCnQ,14356
 crosshair/_tracers_test.py,sha256=KpCGspjOUeZuhwTYgn_RxI4M4wMbT5rldusFDgneQ6M,3596
 crosshair/abcstring.py,sha256=ROU8LzS7kfEU2L_D3QfhVxIjrYr1VctwUWfylC7KlCc,6549
-crosshair/auditwall.py,sha256=FjpeqM6HxsKYEfVJ20CRzkQu1I2zt1dpzwejrDp-W9U,4975
+crosshair/auditwall.py,sha256=sqOmfXQLgmGfWS7b8SmVv66eFM2owaGn-4Ppq453VLI,5138
 crosshair/auditwall_test.py,sha256=VPcw_OW3nl3BkOZY4wEEtVDyTamdgqD4IjRccI2p5vI,2030
 crosshair/codeconfig.py,sha256=GgF-ND8Ha3FysSTQ-JuezHjlhGVBbo5aCJov1Ps3VSE,3959
 crosshair/codeconfig_test.py,sha256=RnC-RnNpr6If4eHmOepDZ33MCmfyhup08dzHKCm5xWA,3350
@@ -32,11 +32,11 @@ crosshair/fuzz_core_test.py,sha256=q7WsZt6bj5OJrXaVsT3JaRYWWnL8X_1flSfty4Z7CcA,1
 crosshair/lsp_server.py,sha256=j7SX4pdVwa2MrtkNIjajLilzl5CZTY6PrBQsa26cdNo,8670
 crosshair/lsp_server_test.py,sha256=7LO1Qqxkper3Xt2krgOlGqF1O_uDObo76o4FZbIqykY,969
 crosshair/main.py,sha256=6RXjj1FIyBK6i6xOx-bs-CsHLgOZcc9hL3U1JRwxpA0,34378
-crosshair/main_test.py,sha256=DFXtE--616vCF1WAS576SHXO19K0LsDPzJIWNT5vuXM,14383
+crosshair/main_test.py,sha256=eEoK4LHKSaX-6iJx3tAVbwCaBJc0ri3VoCPtLD5em2U,14424
 crosshair/objectproxy.py,sha256=Uc6mNkJBInvETGWBHI10GSNEIrBYDIxlAZ30M3PAIhQ,8935
 crosshair/objectproxy_test.py,sha256=KykRJLSHCDA7jb_XPBDhXHnS6Q1fG4oIJ579CeSEz3k,567
 crosshair/opcode_intercept.py,sha256=z4Yb9prYE2UK21AxhjAeXyXAk5IriDuCSSCeNhbDu2A,21880
-crosshair/opcode_intercept_test.py,sha256=hBf04VwhaIzPdoAaqQmQJfx36yaznD9sm9x1Lb9VDm8,8790
+crosshair/opcode_intercept_test.py,sha256=Si3rJQR5cs5d4uB8uwE2K8MjP8rE1a4yHkjXzhfS10A,9241
 crosshair/options.py,sha256=htQNgnrpoRjSNq6rfLBAF8nos-NNIwmP6tQYyI8ugsM,6775
 crosshair/options_test.py,sha256=lzA-XtwEwQPa4wV1wwhCRKhyLOvIhThU9WK5QRaRbxQ,379
 crosshair/patch_equivalence_test.py,sha256=mvYpsbHZS2AiQra-jK8T8QywAG1gNNCUNQPPWI9k5t8,2506
@@ -100,16 +100,17 @@ crosshair/libimpl/binascii_ch_test.py,sha256=hFqSfF1Q8jl2LNBIWaQ6vBJIIshPOmSwrR0
 crosshair/libimpl/binascii_test.py,sha256=LOBqLAJ77Kx8vorjVTaT3X0Z93zw4P5BvwUapMCiSLg,1970
 crosshair/libimpl/binasciilib.py,sha256=9w4C37uxRNOmz9EUuhJduHlMKn0f7baY5fwwdvx1uto,5070
 crosshair/libimpl/bisectlib_test.py,sha256=ZQtYmBYD0Pb1IiFelsgdvqyeUMKaqaDb1BRb87LTSbI,753
-crosshair/libimpl/builtinslib.py,sha256=9qAV1xZ2oZrIrpfWQ3BXgnY0nK2Gjov4v207x43lTq4,171629
+crosshair/libimpl/builtinslib.py,sha256=0NRP8l_weL0kh050cOKMrqK8y-glh3NySYLJYjdHVz8,171622
 crosshair/libimpl/builtinslib_ch_test.py,sha256=W4wWapqlxSjsC5XgREfgxS9e_iwKxgNQhbFE3umUfNI,30504
-crosshair/libimpl/builtinslib_test.py,sha256=Q0DvH7Q_Ja0Tg83enhB_y_Pdau_S-bA6ztorjvgl4Mw,90275
+crosshair/libimpl/builtinslib_test.py,sha256=Y_jRe5J6pPaJ_Nuk1lJ1biP5yczsfCj--NgNhwcbAfQ,90654
 crosshair/libimpl/codecslib.py,sha256=lB87T1EYSBh4JXaqzjSpQG9CMfKtgckwA7f6OIR0S-Q,2668
 crosshair/libimpl/codecslib_test.py,sha256=8K64njhxnTe7qLh-_onARNsm_qSG7BWM5dXgADYi54A,2536
 crosshair/libimpl/collectionslib.py,sha256=VuDIOUOGORiUT9J0tDVECr6oC-yUR3WAiFnMeVGzi-o,8583
 crosshair/libimpl/collectionslib_ch_test.py,sha256=PYitnmXXEZfm25FzBodEX1hOpwqnDspbqt5aqzeVar0,5855
 crosshair/libimpl/collectionslib_test.py,sha256=3h7XTToKWauMhjrEwLXVI0jT8FZKBlkvlw0oiPMmuKM,9164
 crosshair/libimpl/copylib.py,sha256=icHJWeFK_tsPSdJhvlS5fVcBwlh0uJh0nzXsRJCGtzs,527
-crosshair/libimpl/datetimelib.py,sha256=osysXCLJCgyCj0gR8e0iyCeulgUvJ9rrO60kz1gudAY,78869
+crosshair/libimpl/copylib_test.py,sha256=VpS9ICvIjzKw0kccsl1v5FB1chHHEIWdOAerEQ_pGMw,705
+crosshair/libimpl/datetimelib.py,sha256=kVWcoHMX-dPW-un7XoEIURfWlVOst6h_JFmjrhFiE1U,79168
 crosshair/libimpl/datetimelib_ch_test.py,sha256=r_V9H34a4POlEeffi46mEtVI9ek80DHaEOiCTKON9Us,9283
 crosshair/libimpl/datetimelib_test.py,sha256=v9Cg512AXIGy7_dsN2y_ZD7W7fqfSSz07eiCUZukM60,2659
 crosshair/libimpl/decimallib.py,sha256=zBKDrDZcg45oCKUkf6SIDuVpjA1Web7tD1MEQo5cjxI,177348
@@ -166,9 +167,9 @@ crosshair/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 crosshair/tools/check_help_in_doc.py,sha256=P21AH3mYrTVuBgWD6v65YXqBqmqpQDUTQeoZ10rB6TU,8235
 crosshair/tools/check_init_and_setup_coincide.py,sha256=kv61bXqKSKF_5J-kLNEhCrCPyszg7iZQWDu_Scnec98,3502
 crosshair/tools/generate_demo_table.py,sha256=0SeO0xQdiT-mbLNHt4rYL0wcc2DMh0v3qtzBdoQonDk,3831
-crosshair_tool-0.0.86.dist-info/METADATA,sha256=8n0ualxjh4y_waUzDZfliJjet2bID8tHk6kQIiwX2-M,6717
-crosshair_tool-0.0.86.dist-info/WHEEL,sha256=Vcrdz_kmEeMHHp5_nXwfwlfy2HypGLw-op-_VZAEcWM,110
-crosshair_tool-0.0.86.dist-info/entry_points.txt,sha256=u5FIPVn1jqn4Kzg5K_iNnbP6L4hQw5FWjQ0UMezG2VE,96
-crosshair_tool-0.0.86.dist-info/top_level.txt,sha256=2jLWtM-BWg_ZYNbNfrcds0HFZD62a6J7ZIbcgcQrRk4,29
-crosshair_tool-0.0.86.dist-info/RECORD,,
-crosshair_tool-0.0.86.dist-info/licenses/LICENSE,sha256=NVyMvNqn1pH6RSHs6RWRcJyJvORnpgGFBlF73buqYJ0,4459
+crosshair_tool-0.0.88.dist-info/METADATA,sha256=fb65F1neoaCfY1YaRda8cocX3gOjjCWW5it7Xn2DXto,6726
+crosshair_tool-0.0.88.dist-info/WHEEL,sha256=U4i16otdlfBhNVHGS7XHFbWxUW-DEunqf9S09fwcX-w,110
+crosshair_tool-0.0.88.dist-info/entry_points.txt,sha256=u5FIPVn1jqn4Kzg5K_iNnbP6L4hQw5FWjQ0UMezG2VE,96
+crosshair_tool-0.0.88.dist-info/top_level.txt,sha256=2jLWtM-BWg_ZYNbNfrcds0HFZD62a6J7ZIbcgcQrRk4,29
+crosshair_tool-0.0.88.dist-info/RECORD,,
+crosshair_tool-0.0.88.dist-info/licenses/LICENSE,sha256=NVyMvNqn1pH6RSHs6RWRcJyJvORnpgGFBlF73buqYJ0,4459

{crosshair_tool-0.0.86.dist-info → crosshair_tool-0.0.88.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: false
 Tag: cp310-cp310-musllinux_1_2_i686