Commit fbb18722 authored by scoder's avatar scoder Committed by GitHub

Merge pull request #1960 from cython/dalcinl/fix-try-finally

Minor changes to try/finally code generation [should silence Coverity]
parents cb69819a a85eaad1
...@@ -7139,6 +7139,7 @@ class TryFinallyStatNode(StatNode): ...@@ -7139,6 +7139,7 @@ class TryFinallyStatNode(StatNode):
code.putln('}') code.putln('}')
if preserve_error: if preserve_error:
code.put_label(new_error_label)
code.putln('/*exception exit:*/{') code.putln('/*exception exit:*/{')
if not self.in_generator: if not self.in_generator:
code.putln("__Pyx_PyThreadState_declare") code.putln("__Pyx_PyThreadState_declare")
...@@ -7156,7 +7157,6 @@ class TryFinallyStatNode(StatNode): ...@@ -7156,7 +7157,6 @@ class TryFinallyStatNode(StatNode):
exc_vars = tuple([ exc_vars = tuple([
code.funcstate.allocate_temp(py_object_type, manage_ref=False) code.funcstate.allocate_temp(py_object_type, manage_ref=False)
for _ in range(6)]) for _ in range(6)])
code.put_label(new_error_label)
self.put_error_catcher( self.put_error_catcher(
code, temps_to_clean_up, exc_vars, exc_lineno_cnames, exc_filename_cname) code, temps_to_clean_up, exc_vars, exc_lineno_cnames, exc_filename_cname)
finally_old_labels = code.all_new_labels() finally_old_labels = code.all_new_labels()
...@@ -7249,11 +7249,11 @@ class TryFinallyStatNode(StatNode): ...@@ -7249,11 +7249,11 @@ class TryFinallyStatNode(StatNode):
code.globalstate.use_utility_code(get_exception_utility_code) code.globalstate.use_utility_code(get_exception_utility_code)
code.globalstate.use_utility_code(swap_exception_utility_code) code.globalstate.use_utility_code(swap_exception_utility_code)
code.putln(' '.join(["%s = 0;"]*len(exc_vars)) % exc_vars)
if self.is_try_finally_in_nogil: if self.is_try_finally_in_nogil:
code.put_ensure_gil(declare_gilstate=False) code.put_ensure_gil(declare_gilstate=False)
code.putln("__Pyx_PyThreadState_assign") code.putln("__Pyx_PyThreadState_assign")
code.putln(' '.join(["%s = 0;" % var for var in exc_vars]))
for temp_name, type in temps_to_clean_up: for temp_name, type in temps_to_clean_up:
code.put_xdecref_clear(temp_name, type) code.put_xdecref_clear(temp_name, type)
...@@ -7298,7 +7298,7 @@ class TryFinallyStatNode(StatNode): ...@@ -7298,7 +7298,7 @@ class TryFinallyStatNode(StatNode):
if self.is_try_finally_in_nogil: if self.is_try_finally_in_nogil:
code.put_release_ensured_gil() code.put_release_ensured_gil()
code.putln(' '.join(["%s = 0;"]*len(exc_vars)) % exc_vars) code.putln(' '.join(["%s = 0;" % var for var in exc_vars]))
if exc_lineno_cnames: if exc_lineno_cnames:
code.putln("%s = %s; %s = %s; %s = %s;" % ( code.putln("%s = %s; %s = %s; %s = %s;" % (
Naming.lineno_cname, exc_lineno_cnames[0], Naming.lineno_cname, exc_lineno_cnames[0],
......
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