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

transforms.llvm_ir_generator: compare exn typeinfo using strcmp. 

This is necessary to correctly catch exceptions from RPCs.
This commit is contained in:
whitequark 2015-12-31 19:53:28 +08:00
parent 9ed6b54249
commit 0b69e488e6
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
artiq/compiler/transforms/llvm_ir_generator.py
View File

@ -364,6 +364,8 @@ class LLVMIRGenerator:
llty = ll.FunctionType(llvoid, [self.llty_of_type(builtins.TException())]) llty = ll.FunctionType(llvoid, [self.llty_of_type(builtins.TException())])
elif name == "__artiq_reraise": elif name == "__artiq_reraise":
llty = ll.FunctionType(llvoid, []) llty = ll.FunctionType(llvoid, [])
elif name == "strcmp":
llty = ll.FunctionType(lli32, [llptr, llptr])
elif name == "send_rpc": elif name == "send_rpc":
llty = ll.FunctionType(llvoid, [lli32, llptr], llty = ll.FunctionType(llvoid, [lli32, llptr],
var_arg=True) var_arg=True)
@ -1159,7 +1161,10 @@ class LLVMIRGenerator:
if typ is None: if typ is None:
self.llbuilder.branch(self.map(target)) self.llbuilder.branch(self.map(target))
else: else:
llmatchingclause = self.llbuilder.icmp_unsigned('==', llexnname, llclauseexnname) llexnmatch = self.llbuilder.call(self.llbuiltin("strcmp"),
[llexnname, llclauseexnname])
llmatchingclause = self.llbuilder.icmp_unsigned('==',
llexnmatch, ll.Constant(lli32, 0))
with self.llbuilder.if_then(llmatchingclause): with self.llbuilder.if_then(llmatchingclause):
self.llbuilder.branch(self.map(target)) self.llbuilder.branch(self.map(target))

1
artiq/runtime/ksupport.c
View File

@ -92,6 +92,7 @@ static const struct symbol runtime_exports[] = {
{"__artiq_personality", &__artiq_personality}, {"__artiq_personality", &__artiq_personality},
{"__artiq_raise", &__artiq_raise}, {"__artiq_raise", &__artiq_raise},
{"__artiq_reraise", &__artiq_reraise}, {"__artiq_reraise", &__artiq_reraise},
{"strcmp", &strcmp},
{"abort", &ksupport_abort}, {"abort", &ksupport_abort},
/* proxified syscalls */ /* proxified syscalls */