diff options
| author | Eddie Hung <eddie@fpgeh.com> | 2019-08-07 11:11:50 -0700 |
|---|---|---|
| committer | Eddie Hung <eddie@fpgeh.com> | 2019-08-07 11:11:50 -0700 |
| commit | e6d5147214bd157c457654dc46547775ec6ad324 (patch) | |
| tree | 420b4e76aec5d70e2f83b2aa56a783ea5b461a66 /frontends/ast | |
| parent | 0c78c62d6c043925293c0ff934c41f2df6932b85 (diff) | |
| parent | 5545cd3c108ef240ccf6278b2734412acf81cd2a (diff) | |
| download | yosys-e6d5147214bd157c457654dc46547775ec6ad324.tar.gz yosys-e6d5147214bd157c457654dc46547775ec6ad324.tar.bz2 yosys-e6d5147214bd157c457654dc46547775ec6ad324.zip | |
Merge remote-tracking branch 'origin/master' into eddie/cleanup
Diffstat (limited to 'frontends/ast')
| -rw-r--r-- | frontends/ast/simplify.cc | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc index b27780fae..467b2e5c0 100644 --- a/frontends/ast/simplify.cc +++ b/frontends/ast/simplify.cc @@ -3439,19 +3439,11 @@ AstNode *AstNode::eval_const_function(AstNode *fcall) { std::map<std::string, AstNode*> backup_scope; std::map<std::string, AstNode::varinfo_t> variables; - bool delete_temp_block = false; - AstNode *block = NULL; + AstNode *block = new AstNode(AST_BLOCK); size_t argidx = 0; for (auto child : children) { - if (child->type == AST_BLOCK) - { - log_assert(block == NULL); - block = child; - continue; - } - if (child->type == AST_WIRE) { while (child->simplify(true, false, false, 1, -1, false, true)) { } @@ -3468,13 +3460,9 @@ AstNode *AstNode::eval_const_function(AstNode *fcall) continue; } - log_assert(block == NULL); - delete_temp_block = true; - block = new AstNode(AST_BLOCK); block->children.push_back(child->clone()); } - log_assert(block != NULL); log_assert(variables.count(str) != 0); while (!block->children.empty()) @@ -3642,8 +3630,7 @@ AstNode *AstNode::eval_const_function(AstNode *fcall) log_abort(); } - if (delete_temp_block) - delete block; + delete block; for (auto &it : backup_scope) if (it.second == NULL) |