transforms.llvm_ir_generator: compare exn typeinfo using strcmp.

This is necessary to correctly catch exceptions from RPCs.
m-labs · Dec 31, 2015 · 0b69e48 · 0b69e48
1 parent 9ed6b54
commit 0b69e48
Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/artiq/compiler/transforms/llvm_ir_generator.py b/artiq/compiler/transforms/llvm_ir_generator.py
@@ -364,6 +364,8 @@ def llbuiltin(self, name):
             llty = ll.FunctionType(llvoid, [self.llty_of_type(builtins.TException())])
         elif name == "__artiq_reraise":
             llty = ll.FunctionType(llvoid, [])
+        elif name == "strcmp":
+            llty = ll.FunctionType(lli32, [llptr, llptr])
         elif name == "send_rpc":
             llty = ll.FunctionType(llvoid, [lli32, llptr],
                                    var_arg=True)
@@ -1159,7 +1161,10 @@ def process_LandingPad(self, insn):
             if typ is None:
                 self.llbuilder.branch(self.map(target))
             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):
                     self.llbuilder.branch(self.map(target))
 

diff --git a/artiq/runtime/ksupport.c b/artiq/runtime/ksupport.c
@@ -92,6 +92,7 @@ static const struct symbol runtime_exports[] = {
     {"__artiq_personality", &__artiq_personality},
     {"__artiq_raise", &__artiq_raise},
     {"__artiq_reraise", &__artiq_reraise},
+    {"strcmp", &strcmp},
     {"abort", &ksupport_abort},
 
     /* proxified syscalls */