LLVMIRGenerator: attach debug metadata to all emitted LLVM instructions.

whitequark · whitequark · commit 53b4d87647c0 · 2015-08-19T12:18:20.000-07:00
diff --git a/artiq/compiler/transforms/llvm_ir_generator.py b/artiq/compiler/transforms/llvm_ir_generator.py
@@ -387,14 +387,14 @@ def process_function(self, func):
             for block in func.basic_blocks:
                 self.llbuilder.position_at_end(self.llmap[block])
                 for insn in block.instructions:
+                    if insn.loc is not None:
+                        self.llbuilder.debug_metadata = \
+                            self.debug_info_emitter.emit_loc(insn.loc, disubprogram)
+
                     llinsn = getattr(self, "process_" + type(insn).__name__)(insn)
                     assert llinsn is not None
                     self.llmap[insn] = llinsn
 
-                    if insn.loc is not None and not isinstance(llinsn, ll.Constant):
-                        diloc = self.debug_info_emitter.emit_loc(insn.loc, disubprogram)
-                        llinsn.set_metadata('dbg', diloc)
-
                 # There is no 1:1 correspondence between ARTIQ and LLVM
                 # basic blocks, because sometimes we expand a single ARTIQ
                 # instruction so that the result spans several LLVM basic
