From: Eddie Hung <eddie@fpgeh.com>
Date: Thu, 29 Aug 2019 16:02:10 +0000 (-0700)
Subject: Restore non-deferred code, deferred case to ignore non constant attr
X-Git-Tag: working-ls180~1078^2~6
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6510297712729f9742d00f6a4cd4fc3a0e530758;p=yosys.git

Restore non-deferred code, deferred case to ignore non constant attr
---

diff --git a/frontends/ast/ast.cc b/frontends/ast/ast.cc
index 6a91c418b..01e865557 100644
--- a/frontends/ast/ast.cc
+++ b/frontends/ast/ast.cc
@@ -1073,6 +1073,12 @@ static AstModule* process_module(AstNode *ast, bool defer, AstNode *original_ast
 
 		ignoreThisSignalsInInitial = RTLIL::SigSpec();
 
+		for (auto &attr : ast->attributes) {
+			if (attr.second->type != AST_CONSTANT)
+				log_file_error(ast->filename, ast->linenum, "Attribute `%s' with non-constant value!\n", attr.first.c_str());
+			current_module->attributes[attr.first] = attr.second->asAttrConst();
+		}
+
 		for (size_t i = 0; i < ast->children.size(); i++) {
 			AstNode *node = ast->children[i];
 			if (node->type == AST_WIRE || node->type == AST_MEMORY)
@@ -1094,11 +1100,12 @@ static AstModule* process_module(AstNode *ast, bool defer, AstNode *original_ast
 
 		ignoreThisSignalsInInitial = RTLIL::SigSpec();
 	}
-
-	for (auto &attr : ast->attributes) {
-		if (attr.second->type != AST_CONSTANT)
-			log_file_error(ast->filename, ast->linenum, "Attribute `%s' with non-constant value!\n", attr.first.c_str());
-		current_module->attributes[attr.first] = attr.second->asAttrConst();
+	else {
+		for (auto &attr : ast->attributes) {
+			if (attr.second->type != AST_CONSTANT)
+				continue;
+			current_module->attributes[attr.first] = attr.second->asAttrConst();
+		}
 	}
 
 	if (ast->type == AST_INTERFACE)