Add linemarks test, address issues found by it

Author: lwaern-intel

doc/1.4/running-dmlc.md

@@ -115,6 +115,11 @@ causes generated C code to follow the DML code more closely.
 
 Adds Synopsys® Coverity® analysis annotations to suppress common false positives
 in generated C code created from DML 1.4 device models.
+
+Analysis annotation generation impacts the generation of line directives in a
+way that may cause debugging or coverage tools besides Coverity to display
+unexpected behavior. Because of this, it's recommended that `--coverity` is
+only used when needed.
 </dd><dt>
 
 --warn=*tag*

py/dml/c_backend.py

@@ -1874,7 +1874,7 @@ def generate_init_data_objs(device):
                         else:
                             markers = ([('store_writes_const_field', 'FALSE')]
                                        if deep_const(node._type) else [])
-                            coverity_markers(markers, node.site)
+                            coverity_markers(markers, init.site)
                             init.assign_to(nref, node._type)
             else:
                 index_exprs = ()
@@ -1888,7 +1888,7 @@ def generate_init_data_objs(device):
                 with allow_linemarks():
                     markers = ([('store_writes_const_field', 'FALSE')]
                                if deep_const(node._type) else [])
-                    coverity_markers(markers, node.site)
+                    coverity_markers(markers, init.site)
                     init.assign_to(nref, node._type)
                 for _ in range(node.dimensions):
                     out('}\n', postindent=-1)
@@ -2153,7 +2153,7 @@ def generate_trait_method(m):
     out('/* %s */\n' % (str(m),))
     start_function_definition(m.declaration())
     with allow_linemarks():
-        site_linemark(m.site)
+        site_linemark(m.astbody.site)
         out('{\n', postindent=1)
         code.toc_inline()
         site_linemark(m.rbrace_site)

py/dml/codegen.py

@@ -1925,7 +1925,9 @@ def codegen_statements(trees, *args):
     return stmts
 
 def codegen_statement(tree, *args):
-    return mkCompound(tree.site, codegen_statements([tree], *args))
+    rbrace_site = tree.args[1] if tree.kind == 'compound' else None
+    return mkCompound(tree.site, codegen_statements([tree], *args),
+                      rbrace_site)
 
 @statement_dispatcher
 def stmt_compound(stmt, location, scope):
@@ -3576,7 +3578,7 @@ def codegen_inline(site, meth_node, indices, inargs, outargs,
             else:
                 param_scope.add_variable(parmname,
                                          type = parmtype or arg.ctype(),
-                                         site = meth_node.site,
+                                         site = arg.site,
                                          init = ExpressionInitializer(arg))
                 arg.decref()
 

py/dml/ctree.py

@@ -736,6 +736,10 @@ def __init__(self, site, cond, truebranch, falsebranch, else_site):
         assert_type(site, truebranch, Statement)
         assert_type(site, falsebranch, (Statement, type(None)))
     def toc_stmt(self):
+        # When needed as a single statement, if-else statements are wrapped in
+        # braces. This is to avoid ambiguity in generated C if this if-else is
+        # used as branch of another if-else, which GCC would otherwise complain
+        # about
         site_linemark(self.site)
         out('{\n',postindent=1)
         self.toc_inline()
@@ -4826,6 +4830,9 @@ def __str__(self):
         return "%s" % self.expr
     def __repr__(self):
         return "ExpressionInitializer(%r)" % self.expr
+    @property
+    def site(self):
+        return self.expr.site
     def incref(self):
         self.expr.incref()
     def decref(self):
@@ -5034,7 +5041,7 @@ def toc(self):
             # ducks a potential GCC warning, and also serves to
             # zero-initialize VLAs
             self.type.print_declaration(self.name, unused = self.unused)
-            self.linemark()
+            site_linemark(self.init.site)
             self.init.assign_to(mkLit(self.site, self.name, self.type),
                                 self.type)
         else:
@@ -5100,7 +5107,11 @@ def toc(self):
         if dml.globals.linemarks:
             linemark(self.site.lineno, path)
         out(self.text)
-        out('\n#undef %s\n' % (ident,))
+        if not output.current().bol:
+            out('\n')
+        if dml.globals.linemarks:
+            reset_line_directive()
+        out('#undef %s\n' % (ident,))
 
 mkCText = CText
 

py/dml/traits.py

@@ -221,15 +221,15 @@ def codegen_body(self):
               if not self.independent else contextlib.nullcontext()):
             scope = MethodParamScope(self.trait.scope(global_scope))
             implicit_inargs = self.vtable_trait.implicit_args()
-            site = self.site
+            site = SimpleSite(self.site.loc())
             if self.default_trait:
                 default_method = self.default_trait.method_impls[self.name]
                 [(name, typ)] = implicit_inargs
                 default = ExpressionSymbol(
                     'default',
                     TraitMethodDirect(
                         default_method.site,
-                        mkLit(self.site, cident(name), typ),
+                        mkLit(site, cident(name), typ),
                         default_method),
                     site)
             else:
@@ -239,7 +239,7 @@ def codegen_body(self):
             for (n, t) in self.outp:
                 # See SIMICS-19028
                 if deep_const(t):
-                    raise ICE(site,
+                    raise ICE(self.site,
                               'Methods with (partially) const output/return '
                               + 'values are not yet supported.')
 
@@ -249,7 +249,7 @@ def codegen_body(self):
             else:
                 memoization = None
             body = codegen_method(
-                self.site, self.inp, self.outp, self.throws, self.independent,
+                self.astbody.site, self.inp, self.outp, self.throws, self.independent,
                 memoization, self.astbody, default,
                 Location(dml.globals.device, ()), scope, self.rbrace_site)
 

spelling-passlist

@@ -20,3 +20,6 @@ PCHANGE         *
 PCONSTANT       *
 PPARAMETER      *
 poverride       *
+qualifies       *
+prescriptive    *
+delimits        *