m-labs · Jan 10, 2016 · Jan 10, 2016 · Jan 10, 2016
Showing with 10 additions and 2 deletions.

+2 −1 artiq/compiler/transforms/artiq_ir_generator.py

+6 −1 artiq/compiler/transforms/llvm_ir_generator.py

+2 −0 artiq/runtime/session.c
diff --git a/artiq/compiler/transforms/artiq_ir_generator.py b/artiq/compiler/transforms/artiq_ir_generator.py
@@ -320,7 +320,8 @@ def visit_function(self, node, is_lambda, is_internal):
         return self.append(ir.Closure(func, self.current_env))
 
     def visit_FunctionDefT(self, node, in_class=None):
-        func = self.visit_function(node, is_lambda=False, is_internal=len(self.name) > 2)
+        func = self.visit_function(node, is_lambda=False,
+                                   is_internal=len(self.name) > 0 or '.' in node.name)
         if in_class is None:
             self._set_local(node.name, func)
         else:

diff --git a/artiq/compiler/transforms/llvm_ir_generator.py b/artiq/compiler/transforms/llvm_ir_generator.py
@@ -176,6 +176,7 @@ def __init__(self, engine, module_name, target, object_map, type_map):
         self.llobject_map = {}
         self.phis = []
         self.debug_info_emitter = DebugInfoEmitter(self.llmodule)
+        self.empty_metadata = self.llmodule.add_metadata([])
 
     def needs_sret(self, lltyp, may_be_large=True):
         if isinstance(lltyp, ll.VoidType):
@@ -628,6 +629,7 @@ def llptr_to_var(self, llenv, env_ty, var_name, var_type=None):
             outer_index = list(env_ty.params.keys()).index("$outer")
             llptr = self.llbuilder.gep(llenv, [self.llindex(0), self.llindex(outer_index)])
             llouterenv = self.llbuilder.load(llptr)
+            llouterenv.metadata['invariant.load'] = self.empty_metadata
             return self.llptr_to_var(llouterenv, env_ty.params["$outer"], var_name)
 
     def process_GetLocal(self, insn):
@@ -638,7 +640,9 @@ def process_GetLocal(self, insn):
     def process_GetConstructor(self, insn):
         env = insn.environment()
         llptr = self.llptr_to_var(self.map(env), env.type, insn.var_name, insn.type)
-        return self.llbuilder.load(llptr)
+        llconstr = self.llbuilder.load(llptr)
+        llconstr.metadata['invariant.load'] = self.empty_metadata
+        return llconstr
 
     def process_SetLocal(self, insn):
         env = insn.environment()
@@ -874,6 +878,7 @@ def get_outer(llenv, env_ty):
                     outer_index = list(env_ty.params.keys()).index("$outer")
                     llptr = self.llbuilder.gep(llenv, [self.llindex(0), self.llindex(outer_index)])
                     llouterenv = self.llbuilder.load(llptr)
+                    llouterenv.metadata['invariant.load'] = self.empty_metadata
                     return self.llptr_to_var(llouterenv, env_ty.params["$outer"], var_name)
                 else:
                     return llenv

diff --git a/artiq/runtime/session.c b/artiq/runtime/session.c
@@ -1012,6 +1012,7 @@ static int process_kmsg(struct msg_base *umsg)
             }
 
             mailbox_send(&reply);
+            break;
         }
 
         case MESSAGE_TYPE_CACHE_PUT_REQUEST: {
@@ -1049,6 +1050,7 @@ static int process_kmsg(struct msg_base *umsg)
             }
 
             mailbox_send(&reply);
+            break;
         }
 
         default: {