From: Clifford Wolf <clifford@clifford.at>
Date: Fri, 14 Feb 2014 19:45:30 +0000 (+0100)
Subject: Be more conservative with new const-function code
X-Git-Tag: yosys-0.2.0~10
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=45d2b6ffce24c3a4254ef7f80f300cc7840fec25;p=yosys.git

Be more conservative with new const-function code
---

diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index 236843d5d..2ae3cae08 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -148,10 +148,14 @@ bool AstNode::simplify(bool const_fold, bool at_zero, bool in_lvalue, int stage,
 
 	// activate const folding if this is anything that must be evaluated statically (ranges, parameters, attributes, etc.)
 	if (type == AST_WIRE || type == AST_PARAMETER || type == AST_LOCALPARAM || type == AST_DEFPARAM || type == AST_PARASET || type == AST_RANGE || type == AST_PREFIX)
-		const_fold = true, in_param = true;
+		const_fold = true;
 	if (type == AST_IDENTIFIER && current_scope.count(str) > 0 && (current_scope[str]->type == AST_PARAMETER || current_scope[str]->type == AST_LOCALPARAM))
 		const_fold = true;
 
+	// in certain cases a function must be evaluated constant. this is what in_param controls.
+	if (type == AST_PARAMETER || type == AST_LOCALPARAM || type == AST_DEFPARAM || type == AST_PARASET || type == AST_PREFIX)
+		in_param = true;
+
 	std::map<std::string, AstNode*> backup_scope;
 
 	// create name resolution entries for all objects with names