Fix inconsistency with linemark generation with assignments

This is a kludge; RAII will fix this more thoroughly through its write/assign_to revamp

Author: lwaern-intel

py/dml/ctree.py

@@ -986,6 +986,7 @@ def toc(self):
         self.toc_inline()
         out('}\n', preindent=-1)
     def toc_inline(self):
+        self.linemark()
         self.initializer.assign_to(self.target, self.target.ctype())
 
 mkAssignStatement = AssignStatement
@@ -4807,7 +4808,8 @@ def assign_to(self, dest, typ):
                    mkCast(site, self.expr, typ).read(),
                    dest.read()))
         else:
-            mkCopyData(site, self.expr, dest).toc()
+            with disallow_linemarks():
+                mkCopyData(site, self.expr, dest).toc()
 
 class CompoundInitializer(Initializer):
     '''Initializer for a variable of struct or array type, using the

py/dml/expr.py

@@ -25,6 +25,7 @@
     'typecheck_inargs',
     'reset_line_directive',
     'allow_linemarks',
+    'disallow_linemarks',
     'site_linemark',
     'coverity_marker',
     'coverity_markers',
@@ -103,6 +104,16 @@ def allow_linemarks():
         if not prev_linemarks and is_file_output:
             reset_line_directive()
 
+# Locally set dml.globals.linemarks to be False, even if it were already True
+@contextmanager
+def disallow_linemarks():
+    prev_linemarks = dml.globals.linemarks
+    dml.globals.linemarks = False
+    try:
+        yield
+    finally:
+        dml.globals.linemarks = prev_linemarks
+
 def reset_line_directive():
     if dml.globals.linemarks_enabled:
         o = output.current()