luke
/
iverilog
mirror of https://github.com/steveicarus/iverilog.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for pr3534333. 

The parser had been changed to support null statements in sequential
and parallel blocks (a feature introduced in SystemVerilog), but was
not supported in elaboration, leading to a compiler crash. This patch
fixes this by discarding the null statements during parsing.
This commit is contained in:
Martin Whitaker 2012-06-16 23:00:19 +01:00 committed by Stephen Williams
parent 0d0e6d7845
commit bef59e0b6c
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
parse.y
View File

@ -249,9 +249,12 @@ static void current_task_set_statement(const YYLTYPE&loc, vector<Statement*>*s)
current_task->set_statement(tmp); current_task->set_statement(tmp);
return; return;
} }
assert(s);
/* The parser assures that there is a non-empty vector. */ /* An empty vector represents one or more null statements. Handle
assert(s && !s->empty()); this as a simple null statement. */
if (s->empty())
return;
/* A vector of 1 is handled as a simple statement. */ /* A vector of 1 is handled as a simple statement. */
if (s->size() == 1) { if (s->size() == 1) {
@ -284,9 +287,12 @@ static void current_function_set_statement(const YYLTYPE&loc, vector<Statement*>
current_function->set_statement(tmp); current_function->set_statement(tmp);
return; return;
} }
assert(s);
/* The parser assures that there is a non-empty vector. */ /* An empty vector represents one or more null statements. Handle
assert(s && !s->empty()); this as a simple null statement. */
if (s->empty())
return;
/* A vector of 1 is handled as a simple statement. */ /* A vector of 1 is handled as a simple statement. */
if (s->size() == 1) { if (s->size() == 1) {
@ -5699,12 +5705,12 @@ statement_or_null_list_opt
statement_or_null_list statement_or_null_list
: statement_or_null_list statement_or_null : statement_or_null_list statement_or_null
{ vector<Statement*>*tmp = $1; { vector<Statement*>*tmp = $1;
tmp->push_back($2); if ($2) tmp->push_back($2);
$$ = tmp; $$ = tmp;
} }
| statement_or_null | statement_or_null
{ vector<Statement*>*tmp = new vector<Statement*>(1); { vector<Statement*>*tmp = new vector<Statement*>(0);
tmp->at(0) = $1; if ($1) tmp->push_back($1);
$$ = tmp; $$ = tmp;
} }
; ;