Be more conservative with new const-function code

diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index 236843d5d221c9aa79fad6adb58de5abff9208d8..2ae3cae0843133d6c0ae6df1b997ac560255fe4f 100644 (file)
--- 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