Add precise locations for asserts

diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index 04c02d893c9289ba796eb6da2c9e09942e0af544..2fbadcdad5b6ee725cbae9b3f6cf037c433f1180 100644 (file)
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -1811,6 +1811,7 @@ skip_dynamic_range_lvalue_expansion:;
                newNode->children.push_back(assign_en);
 
                AstNode *assertnode = new AstNode(type);
+               assertnode->location = location;
                assertnode->str = str;
                assertnode->children.push_back(new AstNode(AST_IDENTIFIER));
                assertnode->children.push_back(new AstNode(AST_IDENTIFIER));

diff --git a/frontends/verilog/verilog_parser.y b/frontends/verilog/verilog_parser.y
index 1132e97ae6caa67ce17c32192724ec86f48e702a..54166fea735f461e00ae12882e96e359d448f9f0 100644 (file)
--- a/frontends/verilog/verilog_parser.y
+++ b/frontends/verilog/verilog_parser.y
@@ -1955,6 +1955,7 @@ assert:
                        delete $5;
                } else {
                        AstNode *node = new AstNode(assume_asserts_mode ? AST_ASSUME : AST_ASSERT, $5);
+                       SET_AST_NODE_LOC(node, @1, @6);
                        if ($1 != nullptr)
                                node->str = *$1;
                        ast_stack.back()->children.push_back(node);
@@ -1967,6 +1968,7 @@ assert:
                        delete $5;
                } else {
                        AstNode *node = new AstNode(assert_assumes_mode ? AST_ASSERT : AST_ASSUME, $5);
+                       SET_AST_NODE_LOC(node, @1, @6);
                        if ($1 != nullptr)
                                node->str = *$1;
                        ast_stack.back()->children.push_back(node);
@@ -1979,6 +1981,7 @@ assert:
                        delete $6;
                } else {
                        AstNode *node = new AstNode(assume_asserts_mode ? AST_FAIR : AST_LIVE, $6);
+                       SET_AST_NODE_LOC(node, @1, @7);
                        if ($1 != nullptr)
                                node->str = *$1;
                        ast_stack.back()->children.push_back(node);
@@ -1991,6 +1994,7 @@ assert:
                        delete $6;
                } else {
                        AstNode *node = new AstNode(assert_assumes_mode ? AST_LIVE : AST_FAIR, $6);
+                       SET_AST_NODE_LOC(node, @1, @7);
                        if ($1 != nullptr)
                                node->str = *$1;
                        ast_stack.back()->children.push_back(node);
@@ -2000,6 +2004,7 @@ assert:
        } |
        opt_sva_label TOK_COVER opt_property '(' expr ')' ';' {
                AstNode *node = new AstNode(AST_COVER, $5);
+               SET_AST_NODE_LOC(node, @1, @6);
                if ($1 != nullptr) {
                        node->str = *$1;
                        delete $1;
@@ -2008,6 +2013,7 @@ assert:
        } |
        opt_sva_label TOK_COVER opt_property '(' ')' ';' {
                AstNode *node = new AstNode(AST_COVER, AstNode::mkconst_int(1, false));
+               SET_AST_NODE_LOC(node, @1, @5);
                if ($1 != nullptr) {
                        node->str = *$1;
                        delete $1;
@@ -2016,6 +2022,7 @@ assert:
        } |
        opt_sva_label TOK_COVER ';' {
                AstNode *node = new AstNode(AST_COVER, AstNode::mkconst_int(1, false));
+               SET_AST_NODE_LOC(node, @1, @2);
                if ($1 != nullptr) {
                        node->str = *$1;
                        delete $1;
@@ -2027,6 +2034,7 @@ assert:
                        delete $5;
                } else {
                        AstNode *node = new AstNode(AST_ASSUME, $5);
+                       SET_AST_NODE_LOC(node, @1, @6);
                        if ($1 != nullptr)
                                node->str = *$1;
                        ast_stack.back()->children.push_back(node);
@@ -2041,6 +2049,7 @@ assert:
                        delete $6;
                } else {
                        AstNode *node = new AstNode(AST_FAIR, $6);
+                       SET_AST_NODE_LOC(node, @1, @7);
                        if ($1 != nullptr)
                                node->str = *$1;
                        ast_stack.back()->children.push_back(node);
@@ -2053,35 +2062,45 @@ assert:
 
 assert_property:
        opt_sva_label TOK_ASSERT TOK_PROPERTY '(' expr ')' ';' {
-               ast_stack.back()->children.push_back(new AstNode(assume_asserts_mode ? AST_ASSUME : AST_ASSERT, $5));
+               AstNode *node = new AstNode(assume_asserts_mode ? AST_ASSUME : AST_ASSERT, $5);
+               SET_AST_NODE_LOC(node, @1, @6);
+               ast_stack.back()->children.push_back(node);
                if ($1 != nullptr) {
                        ast_stack.back()->children.back()->str = *$1;
                        delete $1;
                }
        } |
        opt_sva_label TOK_ASSUME TOK_PROPERTY '(' expr ')' ';' {
-               ast_stack.back()->children.push_back(new AstNode(AST_ASSUME, $5));
+               AstNode *node = new AstNode(AST_ASSUME, $5);
+               SET_AST_NODE_LOC(node, @1, @6);
+               ast_stack.back()->children.push_back(node);
                if ($1 != nullptr) {
                        ast_stack.back()->children.back()->str = *$1;
                        delete $1;
                }
        } |
        opt_sva_label TOK_ASSERT TOK_PROPERTY '(' TOK_EVENTUALLY expr ')' ';' {
-               ast_stack.back()->children.push_back(new AstNode(assume_asserts_mode ? AST_FAIR : AST_LIVE, $6));
+               AstNode *node = new AstNode(assume_asserts_mode ? AST_FAIR : AST_LIVE, $6);
+               SET_AST_NODE_LOC(node, @1, @7);
+               ast_stack.back()->children.push_back(node);
                if ($1 != nullptr) {
                        ast_stack.back()->children.back()->str = *$1;
                        delete $1;
                }
        } |
        opt_sva_label TOK_ASSUME TOK_PROPERTY '(' TOK_EVENTUALLY expr ')' ';' {
-               ast_stack.back()->children.push_back(new AstNode(AST_FAIR, $6));
+               AstNode *node = new AstNode(AST_FAIR, $6);
+               SET_AST_NODE_LOC(node, @1, @7);
+               ast_stack.back()->children.push_back(node);
                if ($1 != nullptr) {
                        ast_stack.back()->children.back()->str = *$1;
                        delete $1;
                }
        } |
        opt_sva_label TOK_COVER TOK_PROPERTY '(' expr ')' ';' {
-               ast_stack.back()->children.push_back(new AstNode(AST_COVER, $5));
+               AstNode *node = new AstNode(AST_COVER, $5);
+               SET_AST_NODE_LOC(node, @1, @6);
+               ast_stack.back()->children.push_back(node);
                if ($1 != nullptr) {
                        ast_stack.back()->children.back()->str = *$1;
                        delete $1;
@@ -2091,7 +2110,9 @@ assert_property:
                if (norestrict_mode) {
                        delete $5;
                } else {
-                       ast_stack.back()->children.push_back(new AstNode(AST_ASSUME, $5));
+                       AstNode *node = new AstNode(AST_ASSUME, $5);
+                       SET_AST_NODE_LOC(node, @1, @6);
+                       ast_stack.back()->children.push_back(node);
                        if ($1 != nullptr) {
                                ast_stack.back()->children.back()->str = *$1;
                                delete $1;
@@ -2102,7 +2123,9 @@ assert_property:
                if (norestrict_mode) {
                        delete $6;
                } else {
-                       ast_stack.back()->children.push_back(new AstNode(AST_FAIR, $6));
+                       AstNode *node = new AstNode(AST_FAIR, $6);
+                       SET_AST_NODE_LOC(node, @1, @7);
+                       ast_stack.back()->children.push_back(node);
                        if ($1 != nullptr) {
                                ast_stack.back()->children.back()->str = *$1;
                                delete $1;