mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-06-19 12:23:39 +00:00
Code Activity

ast: fix new memory safety bugs from rebase

Browse source
This commit is contained in:
Emil J. Tywoniak 2025-06-17 15:25:57 +02:00
parent 20225d19ae
commit 5af4e05125
3 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
frontends/verilog/verilog_parser.y
View file

@ -2844,6 +2844,7 @@ behavioral_stmt:
std::unique_ptr<AstNode> node_owned;
AstNode* node = nullptr;
AstNode *context = extra->ast_stack.back();
bool patch_block_on_stack = false;
if (context && context->type == AST_BLOCK && context->get_bool_attribute(ID::promoted_if)) {
AstNode *outer = extra->ast_stack[extra->ast_stack.size() - 2];
log_assert (outer && outer->type == AST_CASE);
@ -2852,6 +2853,9 @@ behavioral_stmt:
node = outer;
log_assert (node->children.size());
node->children.pop_back();
// `context` has been killed as a grandchild of `outer`
// we have to undangle it from the stack
patch_block_on_stack = true;
} else if (outer->get_bool_attribute(ID::full_case))
(*$1)[ID::full_case] = AstNode::mkconst_int(1, false);
}
@ -2863,12 +2867,17 @@ behavioral_stmt:
append_attr(node, $1);
node->children.push_back(node->get_bool_attribute(ID::parallel_case) ? AstNode::mkconst_int(1, false, 1) : expr->clone());
extra->ast_stack.back()->children.push_back(std::move(node_owned));
} else {
free_attr($1);
}
auto block_owned = std::make_unique<AstNode>(AST_BLOCK);
auto* block = block_owned.get();
auto cond_owned = std::make_unique<AstNode>(AST_COND, node->get_bool_attribute(ID::parallel_case) ? std::move(expr) : AstNode::mkconst_int(1, false, 1), std::move(block_owned));
SET_AST_NODE_LOC(cond_owned.get(), @4, @4);
node->children.push_back(std::move(cond_owned));
// Double it and give it to the next person
if (patch_block_on_stack)
extra->ast_stack.back() = block;
extra->ast_stack.push_back(node);
extra->ast_stack.push_back(block);
} behavioral_stmt {