m-labs · Dec 31, 2015 · Dec 31, 2015 · Dec 31, 2015
Showing with 36 additions and 20 deletions.

+22 −10 artiq/compiler/transforms/artiq_ir_generator.py

+12 −9 artiq/coredevice/core.py

+2 −1 artiq/runtime/artiq_personality.c
diff --git a/artiq/compiler/transforms/artiq_ir_generator.py b/artiq/compiler/transforms/artiq_ir_generator.py
@@ -150,14 +150,21 @@ def terminate(self, insn):
         else:
             insn.drop_references()
 
+    def warn_unreachable(self, node):
+        diag = diagnostic.Diagnostic("warning",
+            "unreachable code", {},
+            node.loc.begin())
+        self.engine.process(diag)
+
     # Visitors
 
     def visit(self, obj):
         if isinstance(obj, list):
             for elt in obj:
-                self.visit(elt)
                 if self.current_block.is_terminated():
+                    self.warn_unreachable(elt)
                     break
+                self.visit(elt)
         elif isinstance(obj, ast.AST):
             try:
                 old_loc, self.current_loc = self.current_loc, _extract_loc(obj)
@@ -615,7 +622,10 @@ def visit_Try(self, node):
         finally:
             self.unwind_target = old_unwind
 
-        self.visit(node.orelse)
+        if not body.is_terminated():
+            self.visit(node.orelse)
+        elif any(node.orelse):
+            self.warn_unreachable(node.orelse[0])
         body = self.current_block
 
         if any(node.finalbody):
@@ -1435,18 +1445,20 @@ def visit_CompareT(self, node):
 
     # Keep this function with builtins.TException.attributes.
     def alloc_exn(self, typ, message=None, param0=None, param1=None, param2=None):
+        typ = typ.find()
         attributes = [
-            ir.Constant(typ.find().name, ir.TExceptionTypeInfo()),  # typeinfo
-            ir.Constant("<not thrown>", builtins.TStr()),           # file
-            ir.Constant(0, builtins.TInt32()),                      # line
-            ir.Constant(0, builtins.TInt32()),                      # column
-            ir.Constant("<not thrown>", builtins.TStr()),           # function
+            ir.Constant("{}:{}".format(typ.id, typ.name),
+                        ir.TExceptionTypeInfo()),         # typeinfo
+            ir.Constant("<not thrown>", builtins.TStr()), # file
+            ir.Constant(0, builtins.TInt32()),            # line
+            ir.Constant(0, builtins.TInt32()),            # column
+            ir.Constant("<not thrown>", builtins.TStr()), # function
         ]
 
         if message is None:
-            attributes.append(ir.Constant(typ.find().name, builtins.TStr()))
+            attributes.append(ir.Constant(typ.name, builtins.TStr()))
         else:
-            attributes.append(message)                              # message
+            attributes.append(message)                    # message
 
         param_type = builtins.TInt64()
         for param in [param0, param1, param2]:
@@ -1455,7 +1467,7 @@ def alloc_exn(self, typ, message=None, param0=None, param1=None, param2=None):
             else:
                 if param.type != param_type:
                     param = self.append(ir.Coerce(param, param_type))
-                attributes.append(param)                            # paramN, N=0:2
+                attributes.append(param)                  # paramN, N=0:2
 
         return self.append(ir.Alloc(attributes, typ))
 

diff --git a/artiq/coredevice/core.py b/artiq/coredevice/core.py
@@ -1,4 +1,4 @@
-import os
+import os, sys
 
 from pythonparser import diagnostic
 
@@ -13,21 +13,24 @@
 # Import for side effects (creating the exception classes).
 from artiq.coredevice import exceptions
 
+def _render_diagnostic(diagnostic):
+    def shorten_path(path):
+        return path.replace(os.path.normpath(os.path.join(__file__, "..", "..")), "<artiq>")
+    lines = [shorten_path(path) for path in diagnostic.render(colored=True)]
+    return "\n".join(lines)
+
+class _DiagnosticEngine(diagnostic.Engine):
+    def print_diagnostic(self, diagnostic):
+        sys.stderr.write(_render_diagnostic(diagnostic) + "\n")
 
 class CompileError(Exception):
     def __init__(self, diagnostic):
         self.diagnostic = diagnostic
 
-    def render_string(self, colored=False):
-        def shorten_path(path):
-            return path.replace(os.path.normpath(os.path.join(__file__, "..", "..")), "<artiq>")
-        lines = [shorten_path(path) for path in self.diagnostic.render(colored=colored)]
-        return "\n".join(lines)
-
     def __str__(self):
         # Prepend a newline so that the message shows up on after
         # exception class name printed by Python.
-        return "\n" + self.render_string(colored=True)
+        return "\n" + _render_diagnostic(self.diagnostic)
 
 
 @syscall
@@ -58,7 +61,7 @@ def __init__(self, dmgr, ref_period, external_clock=False, comm_device="comm"):
 
     def compile(self, function, args, kwargs, set_result=None, with_attr_writeback=True):
         try:
-            engine = diagnostic.Engine(all_errors_are_fatal=True)
+            engine = _DiagnosticEngine(all_errors_are_fatal=True)
 
             stitcher = Stitcher(engine=engine)
             stitcher.stitch_call(function, args, kwargs, set_result)

diff --git a/artiq/runtime/artiq_personality.c b/artiq/runtime/artiq_personality.c
@@ -423,7 +423,8 @@ _Unwind_Reason_Code __artiq_personality(
                    encodingSize, typeInfoPtrPtr, (void*)typeInfoPtr);
             EH_LOG("typeInfo=%s", (char*)typeInfoPtr);
 
-            if(typeInfoPtr == 0 || !strcmp(inflight->artiq.typeinfo, (char*)typeInfoPtr)) {
+            if(typeInfoPtr == 0 || !strcmp((char*)inflight->artiq.typeinfo,
+                                           (char*)typeInfoPtr)) {
               EH_LOG0("matching action found");
               exceptionMatched = 1;
               break;