Commit bc07e339 authored by Stefan Behnel's avatar Stefan Behnel

fixed ref-count bug in try-except handling

parent bc80f4d2
...@@ -3882,6 +3882,8 @@ class TryExceptStatNode(StatNode): ...@@ -3882,6 +3882,8 @@ class TryExceptStatNode(StatNode):
self.else_clause.generate_execution_code(code) self.else_clause.generate_execution_code(code)
code.putln( code.putln(
"}") "}")
for var in Naming.exc_save_vars:
code.put_xdecref_clear(var, py_object_type)
code.put_goto(try_end_label) code.put_goto(try_end_label)
code.put_label(our_error_label) code.put_label(our_error_label)
code.put_var_xdecrefs_clear(self.cleanup_list) code.put_var_xdecrefs_clear(self.cleanup_list)
......
__doc__ = u"""
>>> class SampleException(Exception): pass
>>> import sys
>>> def assert_refcount(rc1, rc2, func):
... # test ref-counts, but allow a bit of freedom
... assert rc2 <= rc1 + 4, "%s, before: %d, after %d" % (
... func.__name__, rc1, rc2)
>>> def run_test(repeat, test_func):
... initial_refcount = sys.getrefcount(SampleException)
... for i in range(repeat):
... try: raise SampleException
... except:
... refcount1 = sys.getrefcount(SampleException)
... test_func()
... refcount2 = sys.getrefcount(SampleException)
...
... assert_refcount(refcount1, refcount2, test_func)
... assert_refcount(initial_refcount, refcount2, test_func)
... refcount3 = sys.getrefcount(SampleException)
... assert_refcount(refcount1, refcount3, test_func)
... assert_refcount(initial_refcount, refcount3, test_func)
>>> run_test(50, test_no_exception_else)
>>> run_test(50, test_no_exception)
>>> run_test(50, test_exception)
>>> run_test(50, test_finally)
"""
def test_no_exception():
try:
a = 1+1
except:
pass
def test_no_exception_else():
try:
a = 1+1
except:
pass
else:
b = 1+1
def test_exception():
try:
raise TypeError
except:
pass
def test_finally():
try:
a = 1+1
finally:
b = 1+1
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment