more wip

Author: nedbat

coverage/sysmon.py

@@ -115,7 +115,10 @@ def log(msg: str) -> None:
             # f"{root}-{pid}-{tslug}.out",
         ]:
             with open(filename, "a") as f:
-                print(f"{pid}:{tslug}: {msg}", file=f, flush=True)
+                try:
+                    print(f"{pid}:{tslug}: {msg}", file=f, flush=True)
+                except UnicodeError:
+                    print(f"{pid}:{tslug}: {ascii(msg)}", file=f, flush=True)
 
     def arg_repr(arg: Any) -> str:
         """Make a customized repr for logged values."""
@@ -214,6 +217,7 @@ def populate_branch_trails(code: CodeType, code_info: CodeInfo) -> None:
     """
     Populate the `branch_trails` attribute on `code_info`.
     """
+    log(f"populate_branch_trails: {code}")
     iwalker = InstructionWalker(code)
     for inst in iwalker.walk(follow_jumps=False):
         log(f"considering {inst=}")
@@ -225,7 +229,8 @@ def populate_branch_trails(code: CodeType, code_info: CodeInfo) -> None:
             continue
 
         from_line = inst.line_number
-        assert from_line is not None
+        if from_line is None:
+            continue
 
         def walk_one_branch(
             start_at: TOffset, branch_kind: str
@@ -255,14 +260,19 @@ def walk_one_branch(
                 )
                 return inst_offsets, (from_line, to_line)
             else:
-                log(f" no possible branch from @{start_at}: {inst_offsets}")
+                log(f"no possible branch from @{start_at}: {inst_offsets}")
                 return [], None
 
-        code_info.branch_trails[inst.offset] = (
+        trails = [
             walk_one_branch(start_at=inst.offset + 2, branch_kind="not-taken"),
             walk_one_branch(start_at=inst.jump_target, branch_kind="taken"),
-        )
-
+        ]
+        code_info.branch_trails[inst.offset] = trails
+        for trail in trails:
+            for offset in trail[0]:
+                if offset not in code_info.branch_trails:
+                    code_info.branch_trails[offset] = []
+                code_info.branch_trails[offset].append(trail)
 
 @dataclass
 class CodeInfo:
@@ -272,18 +282,15 @@ class CodeInfo:
     file_data: TTraceFileData | None
     byte_to_line: dict[TOffset, TLineNo] | None
     # Keys are start instruction offsets for branches.
-    # Values are two tuples:
-    #   (
+    # Values are lists:
+    #   [
     #       ([offset, offset, ...], (from_line, to_line)),
     #       ([offset, offset, ...], (from_line, to_line)),
-    #   )
+    #   ]
     #   Two possible trails from the branch point, left and right.
     branch_trails: dict[
         TOffset,
-        tuple[
-            tuple[list[TOffset], TArc | None],
-            tuple[list[TOffset], TArc | None],
-        ],
+        list[tuple[list[TOffset], TArc | None]],
     ]
 
 
@@ -448,6 +455,7 @@ def sysmon_py_start(  # pylint: disable=useless-return
             )
             self.code_infos[id(code)] = code_info
             populate_branch_trails(code, code_info)  # TODO: should be a method?
+            log(f"branch_trails for {code}:\n    {code_info.branch_trails}")
             self.code_objects.append(code)
 
             if tracing_code:
@@ -509,6 +517,7 @@ def sysmon_branch_either(
     ) -> MonitorReturn:
         """Handle BRANCH_RIGHT and BRANCH_LEFT events."""
         code_info = self.code_infos[id(code)]
+        added_arc = False
         if code_info.file_data is not None:
             dest_info = code_info.branch_trails.get(instruction_offset)
             log(f"{dest_info = }")
@@ -519,4 +528,17 @@ def sysmon_branch_either(
                     if destination_offset in offsets:
                         cast(set[TArc], code_info.file_data).add(arc)
                         log(f"adding {arc=}")
+                        added_arc = True
+                        break
+
+        if not added_arc:
+            # This could be an exception jumping from line to line.
+            assert code_info.byte_to_line is not None
+            l1 = code_info.byte_to_line[instruction_offset]
+            l2 = code_info.byte_to_line[destination_offset]
+            if l1 != l2:
+                arc = (l1, l2)
+                cast(set[TArc], code_info.file_data).add(arc)
+                log(f"adding unforeseen {arc=}")
+
         return DISABLE

tox.ini

@@ -4,7 +4,7 @@
 [tox]
 # When changing this list, be sure to check the [gh] list below.
 # PYVERSIONS
-envlist = py3{9,10,11,12,13,14}, pypy3, doc, lint, mypy
+envlist = py3{9,10,11,12,13,14}, pypy3, anypy, doc, lint, mypy
 skip_missing_interpreters = {env:COVERAGE_SKIP_MISSING_INTERPRETERS:True}
 toxworkdir = {env:TOXWORKDIR:.tox}