M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

py2llvm: execute finally block when exception is re-raised in handler

This commit is contained in:
Sebastien Bourdeauducq 2014-09-26 23:44:44 +08:00
parent 4978f8b3d7
commit d10112688f
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
artiq/py2llvm/ast_body.py
View File

@ -43,7 +43,7 @@ class Visitor:
self.ns = ns self.ns = ns
self.builder = builder self.builder = builder
self._break_stack = [] self._break_stack = []
self._eid_stack = [] self._active_exception_stack = []
self._exception_level_stack = [0] self._exception_level_stack = [0]
# builder can be None for visit_expression # builder can be None for visit_expression
@ -294,15 +294,21 @@ class Visitor:
pass pass
def _visit_stmt_Raise(self, node): def _visit_stmt_Raise(self, node):
if node.exc is None: if self._active_exception_stack:
eid = self._eid_stack[-1] finally_block, propagate, propagate_eid = self._active_exception_stack[-1]
self.builder.store(lc.Constant.int(lc.Type.int(1), 1), propagate)
if node.exc is not None:
eid = lc.Constant.int(lc.Type.int(), node.exc.args[0].n)
self.builder.store(eid, propagate_eid)
self.builder.branch(finally_block)
else: else:
eid = lc.Constant.int(lc.Type.int(), node.exc.args[0].n) eid = lc.Constant.int(lc.Type.int(), node.exc.args[0].n)
self.env.build_raise(self.builder, eid) self.env.build_raise(self.builder, eid)
def _handle_exception(self, function, finally_block, propagate, propagate_eid, handlers): def _handle_exception(self, function, finally_block, propagate, propagate_eid, handlers):
eid = self.env.build_getid(self.builder) eid = self.env.build_getid(self.builder)
self._eid_stack.append(eid) self._active_exception_stack.append(
(finally_block, propagate, propagate_eid))
self.builder.store(lc.Constant.int(lc.Type.int(1), 1), propagate) self.builder.store(lc.Constant.int(lc.Type.int(1), 1), propagate)
self.builder.store(eid, propagate_eid) self.builder.store(eid, propagate_eid)
@ -336,7 +342,7 @@ class Visitor:
self.builder.position_at_end(cont_exc_block) self.builder.position_at_end(cont_exc_block)
self.builder.branch(finally_block) self.builder.branch(finally_block)
self._eid_stack.pop() self._active_exception_stack.pop()
def _visit_stmt_Try(self, node): def _visit_stmt_Try(self, node):
function = self.builder.basic_block.function function = self.builder.basic_block.function