diff options
| -rw-r--r-- | coverage/parser.py | 23 | ||||
| -rw-r--r-- | test/test_arcs.py | 56 |
2 files changed, 74 insertions, 5 deletions
diff --git a/coverage/parser.py b/coverage/parser.py index 7b899d1..aab50fb 100644 --- a/coverage/parser.py +++ b/coverage/parser.py @@ -193,6 +193,9 @@ OPS_CHUNK_END = _opcode_set( # Opcodes that push a block on the block stack. OPS_PUSH_BLOCK = _opcode_set('SETUP_LOOP', 'SETUP_EXCEPT', 'SETUP_FINALLY') +# Block types for exception handling. +OPS_EXCEPT_BLOCKS = _opcode_set('SETUP_EXCEPT', 'SETUP_FINALLY') + # Opcodes that pop a block from the block stack. OPS_POP_BLOCK = _opcode_set('POP_BLOCK') @@ -327,7 +330,9 @@ class ByteParser: chunk = None bytes_lines_map = dict(self._bytes_lines()) - # The block stack: just store the "handler" value. + # The block stack: loops and try blocks get pushed here for the + # implicit jumps that can occur. + # Each entry is a tuple: (block type, destination) block_stack = [] for bc in ByteCodes(self.code.co_code): @@ -352,7 +357,7 @@ class ByteParser: chunk.exits.add(-1) elif bc.op in OPS_PUSH_BLOCK: # The opcode adds a block to the block_stack. - block_stack.append(bc.jump_to) + block_stack.append((bc.op, bc.jump_to)) elif bc.op in OPS_POP_BLOCK: # The opcode pops a block from the block stack. block_stack.pop() @@ -361,12 +366,20 @@ class ByteParser: if bc.op == OP_BREAK_LOOP: # A break is implicit: jump where the top of the # block_stack points. - chunk.exits.add(block_stack[-1]) + chunk.exits.add(block_stack[-1][1]) chunk = None elif bc.op == OP_END_FINALLY: if block_stack: - chunk.exits.add(block_stack[-1]) - + # A break that goes through a finally will jump to whatever + # block is on top of the stack. + chunk.exits.add(block_stack[-1][1]) + # For the finally clause we need to find the closest exception + # block, and use its jump target as an exit. + for iblock in range(len(block_stack)-1, -1, -1): + if block_stack[iblock][0] in OPS_EXCEPT_BLOCKS: + chunk.exits.add(block_stack[iblock][1]) + break + if chunks: chunks[-1].length = bc.next_offset - chunks[-1].byte for i in range(len(chunks)-1): diff --git a/test/test_arcs.py b/test/test_arcs.py index 30a028e..fa660f8 100644 --- a/test/test_arcs.py +++ b/test/test_arcs.py @@ -231,6 +231,62 @@ class ExceptionArcTest(CoverageTest): arcz=".1 12 23 34 45 68 89 8B 9A AB B.", arcz_missing="68 8B", arcz_unpredicted="58") + def test_finally_in_loop(self): + self.check_coverage("""\ + a, c, d, i = 1, 1, 1, 99 + try: + for i in range(5): + try: + a = 5 + if i > 0: + raise Exception("Yikes!") + a = 8 + finally: + c = 10 + except: + d = 12 # C + assert a == 5 and c == 10 and d == 12 # D + """, + arcz=".1 12 23 34 3D 45 56 67 68 8A A3 AB AD BC CD D.", + arcz_missing="3D AD", arcz_unpredicted="7A") + self.check_coverage("""\ + a, c, d, i = 1, 1, 1, 99 + try: + for i in range(5): + try: + a = 5 + if i > 10: + raise Exception("Yikes!") + a = 8 + finally: + c = 10 + except: + d = 12 # C + assert a == 8 and c == 10 and d == 1 # D + """, + arcz=".1 12 23 34 3D 45 56 67 68 8A A3 AB AD BC CD D.", + arcz_missing="67 AB AD BC CD", arcz_unpredicted="") + + + def test_break_in_finally(self): + self.check_coverage("""\ + a, c, d, i = 1, 1, 1, 99 + try: + for i in range(5): + try: + a = 5 + if i > 0: + break + a = 8 + finally: + c = 10 + except: + d = 12 # C + assert a == 5 and c == 10 and d == 1 # D + """, + arcz=".1 12 23 34 3D 45 56 67 68 7A 8A A3 AB AD BC CD D.", + arcz_missing="3D AB BC CD", arcz_unpredicted="") + if sys.hexversion >= 0x02050000: def test_except_finally(self): self.check_coverage("""\ |