Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions regression/ebmc/smv-netlist/s_until1.desc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
CORE
s_until1.sv
--smv-netlist
^LTLSPEC \(\!node144\) U node151$
^LTLSPEC TRUE U node158$
^LTLSPEC \(\!node144\) U node51$
^LTLSPEC TRUE U node151$
^EXIT=0$
^SIGNAL=0$
--
17 changes: 5 additions & 12 deletions src/verilog/verilog_typecheck_expr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1338,9 +1338,7 @@ exprt verilog_typecheck_exprt::convert_symbol(
{
// A parameter, or enum. The type is elaborated recursively.
elaborate_symbol_rec(symbol->name);
expr.type() = symbol->type;
expr.set_identifier(symbol->name);
return std::move(expr);
return symbol->symbol_expr().with_source_location(expr);
}
else if(symbol->type.id() == ID_verilog_genvar)
{
Expand All @@ -1366,20 +1364,17 @@ exprt verilog_typecheck_exprt::convert_symbol(
{
// A named sequence or property. Create an instance expression,
// and then flatten it.
expr.type() = symbol->type;
expr.set_identifier(symbol->name);
auto symbol_expr = symbol->symbol_expr().with_source_location(expr);
auto &declaration =
to_verilog_sequence_property_declaration_base(symbol->value);
auto instance =
sva_sequence_property_instance_exprt{expr, {}, declaration}
sva_sequence_property_instance_exprt{symbol_expr, {}, declaration}
.with_source_location(expr);
return flatten_named_sequence_property(instance);
}
else
{
expr.type()=symbol->type;
expr.set_identifier(symbol->name);
return std::move(expr);
return symbol->symbol_expr().with_source_location(expr);
}
}
else
Expand All @@ -1392,9 +1387,7 @@ exprt verilog_typecheck_exprt::convert_symbol(
warning().source_location = expr.source_location();
warning() << "implicit wire " << symbol->display_name() << eom;
}
expr.type() = symbol->type;
expr.set_identifier(symbol->name);
return std::move(expr);
return symbol->symbol_expr().with_source_location(expr);
}
else
{
Expand Down
Loading