Skip to content

Commit d7c462c

Browse files
committed
odin - removed unnecessary flag for constant folding in concatenation
1 parent 46b4127 commit d7c462c

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

ODIN_II/SRC/ast_elaborate.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ ast_node_t *reduce_expressions(ast_node_t *node, STRING_CACHE_LIST *local_string
171171
}
172172

173173
/* resolve right-hand side */
174-
node->children[5] = reduce_expressions(node->children[5], local_string_cache_list, NULL, -1);
174+
node->children[5] = reduce_expressions(node->children[5], local_string_cache_list, NULL, 0);
175175
oassert(node->children[5]->type == NUMBERS);
176176

177177
/* this forces parameter values as unsigned, since we don't currently support signed keyword...
@@ -430,15 +430,15 @@ ast_node_t *reduce_expressions(ast_node_t *node, STRING_CACHE_LIST *local_string
430430
node = free_whole_tree(node);
431431
node = new_node;
432432
}
433-
//fallthrough
433+
//fallthrough to resolve concatenation
434434
case CONCATENATE:
435435
{
436436
resolve_concat_sizes(node, local_string_cache_list);
437437

438438
// for params only
439439
// TODO: this is a hack, concats cannot be folded in place as it breaks netlist expand from ast,
440440
// to fix we need to move the node resolution before netlist create from ast.
441-
if(assignment_size == -1 && node->num_children > 0)
441+
if(node->num_children > 0)
442442
{
443443
size_t index = 1;
444444
size_t last_index = 0;

0 commit comments

Comments
 (0)