From 59b67b69f68072d6a0c69f0a45d17a11dc3bd098 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <icarus@martin-whitaker.me.uk>
Date: Thu, 1 Oct 2020 11:33:24 +0100
Subject: [PATCH] Fix width of localparam created from genvar when using
 -gstrict-expr-width.

(cherry picked from commit c4883da334344da016e5af9cc5ce58e2f02d9582)
---
 elab_scope.cc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/elab_scope.cc b/elab_scope.cc
index 23abb1bb8..119d7f677 100644
--- a/elab_scope.cc
+++ b/elab_scope.cc
@@ -966,7 +966,11 @@ bool PGenerate::generate_scope_loop_(Design*des, NetScope*container)
 	      // block. Code within this scope thus has access to the
 	      // genvar as a constant.
 	    {
-		  verinum genvar_verinum(genvar);
+		  verinum genvar_verinum;
+		  if (gn_strict_expr_width_flag)
+			genvar_verinum = verinum(genvar, integer_width);
+		  else
+			genvar_verinum = verinum(genvar);
 		  genvar_verinum.has_sign(true);
 		  NetEConstParam*gp = new NetEConstParam(scope,
 							 loop_index,