crosshair-tool 0.0.87__tar.gz → 0.0.88__tar.gz

{crosshair_tool-0.0.87 → crosshair_tool-0.0.88}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: crosshair-tool
-Version: 0.0.87
+Version: 0.0.88
 Summary: Analyze Python code for correctness using symbolic execution.
 Home-page: https://github.com/pschanely/CrossHair
 Author: Phillip Schanely

{crosshair_tool-0.0.87 → crosshair_tool-0.0.88}/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.87"  # 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_tool-0.0.87 → crosshair_tool-0.0.88}/crosshair/_tracers.c

@@ -383,17 +383,19 @@ if (!self->trace_all_opcodes) {
     unsigned char * code_bytes = (unsigned char *)PyBytes_AS_STRING(code_bytes_object);
 
     self->handling = TRUE;
-    BOOL ran_handler = FALSE;
 
-    FrameAndCallbackVec* vec = &self->postop_callbacks;
+    FrameNextIandCallbackVec* vec = &self->postop_callbacks;
     int cb_count = vec->count;
     if (cb_count > 0)
     {
-        FrameAndCallback fcb = vec->items[cb_count - 1];
+        FrameNextIandCallback fcb = vec->items[cb_count - 1];
         // Check that the top callback is for this frame (it might be for a caller's frame instead)
-        if (fcb.frame == (PyObject*)frame)
+        if (fcb.frame == frame)
         {
-            ran_handler = TRUE;
+            if (fcb.expected_i != PyFrame_GetLasti(frame)) {
+                // Most likely, we fell into an exception handler and should not execute the callback.
+                // fprintf(stderr, "UNEXPECTED lasti: %x %d %d, dropping callback\n", fcb.frame, fcb.expected_i, PyFrame_GetLasti(frame));
+            } else {
             PyObject* cb = fcb.callback;
             PyObject* result = NULL;
             result = PyObject_CallObject(cb, NULL);
@@ -406,6 +408,7 @@ if (!self->trace_all_opcodes) {
             Py_DECREF(result);
             vec->count--;
             Py_DECREF(cb);
+            }
         }
     }
 
@@ -423,7 +426,6 @@ if (!self->trace_all_opcodes) {
         if (handler == NULL) {
             continue;
         }
-        ran_handler = TRUE;
 
         PyObject * arglist = Py_BuildValue("Osi", frame, "opcode", opcode);
         if (arglist == NULL) // (out of memory)
@@ -441,7 +443,7 @@ if (!self->trace_all_opcodes) {
         Py_DECREF(result);
     }
     // repr_print(frame);
-    // printf("lasti %d, line %d, cb_count %d, ran_handler %d, ret %d\n", lasti, PyFrame_GetLineNumber(frame), cb_count, ran_handler, ret);
+    // printf("lasti %d, line %d, cb_count %d, ret %d\n", lasti, PyFrame_GetLineNumber(frame), cb_count, ret);
     self->handling = FALSE;
     Py_XDECREF(code_bytes_object);
 
@@ -603,7 +605,7 @@ done:
 static PyObject *
 CTracer_push_postop_callback(CTracer *self, PyObject *args)
 {
-    PyObject *frame;
+    PyFrameObject *frame;
     PyObject *callback;
     if (!PyArg_ParseTuple(args, "OO", &frame, &callback)) {
         return NULL;
@@ -615,7 +617,8 @@ CTracer_push_postop_callback(CTracer *self, PyObject *args)
     }
 #endif
     Py_INCREF(callback);
-    FrameAndCallback fcb = {frame, callback};
+    // TODO: if we add branching opcodes, there will be two possible next instruction locations:
+    FrameNextIandCallback fcb = {frame, PyFrame_GetLasti(frame) + 2, callback};
     push_framecb(&self->postop_callbacks, fcb);
     Py_RETURN_NONE;
 }

{crosshair_tool-0.0.87 → crosshair_tool-0.0.88}/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_tool-0.0.87 → crosshair_tool-0.0.88}/crosshair/libimpl/builtinslib.py

@@ -1425,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_tool-0.0.87 → crosshair_tool-0.0.88}/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_tool-0.0.88/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_tool-0.0.87 → crosshair_tool-0.0.88}/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_tool-0.0.87 → crosshair_tool-0.0.88}/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_tool-0.0.87 → crosshair_tool-0.0.88}/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.87 → crosshair_tool-0.0.88}/crosshair_tool.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: crosshair-tool
-Version: 0.0.87
+Version: 0.0.88
 Summary: Analyze Python code for correctness using symbolic execution.
 Home-page: https://github.com/pschanely/CrossHair
 Author: Phillip Schanely

{crosshair_tool-0.0.87 → crosshair_tool-0.0.88}/crosshair_tool.egg-info/SOURCES.txt

@@ -113,6 +113,7 @@ crosshair/libimpl/collectionslib.py
 crosshair/libimpl/collectionslib_ch_test.py
 crosshair/libimpl/collectionslib_test.py
 crosshair/libimpl/copylib.py
+crosshair/libimpl/copylib_test.py
 crosshair/libimpl/datetimelib.py
 crosshair/libimpl/datetimelib_ch_test.py
 crosshair/libimpl/datetimelib_test.py

{crosshair_tool-0.0.87 → crosshair_tool-0.0.88}/setup.py

@@ -14,7 +14,7 @@ from setuptools import Extension, find_packages, setup  # type: ignore
 # the pre-commit checks through check_init_and_setup_coincide.py.
 setup(
     name="crosshair-tool",
-    version="0.0.87",  # Update this in crosshair/__init__.py too
+    version="0.0.88",  # Update this in crosshair/__init__.py too
     author="Phillip Schanely",
     author_email="pschanely+vE7F@gmail.com",
     ext_modules=[