From 65be2448dc4f9eceec524becbdc6eb1aa49ed1dc Mon Sep 17 00:00:00 2001
From: Johan Bjork <johan.bjork@twosigma.com>
Date: Thu, 4 Feb 2016 18:38:59 -0500
Subject: [PATCH] Fix elaboration-time display warnings, bug1032.

Signed-off-by: Wilson Snyder <wsnyder@wsnyder.org>
---
 Changes                        | 2 ++
 src/V3Error.cpp                | 5 ++++-
 test_regress/t/t_assert_elab.v | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Changes b/Changes
index 2db9184d1..cc11eda34 100644
--- a/Changes
+++ b/Changes
@@ -17,6 +17,8 @@ indicates the contributor was also the author of the fix; Thanks!
 
 ****  Fix read-after-free error, bug1031. [Johan Bjork]
 
+****  Fix elaboration-time display warnings, bug1032. [Johan Bjork]
+
 
 * Verilator 3.880 2015-12-19
 
diff --git a/src/V3Error.cpp b/src/V3Error.cpp
index 1ec4c5e41..083db61c7 100644
--- a/src/V3Error.cpp
+++ b/src/V3Error.cpp
@@ -111,6 +111,7 @@ void V3Error::abortIfWarnings() {
 
 bool V3Error::isError(V3ErrorCode code, bool supp) {
     if (supp) return false;
+    else if (code==V3ErrorCode::USERINFO) return false;
     else if (code==V3ErrorCode::EC_INFO) return false;
     else if (code==V3ErrorCode::EC_FATAL) return true;
     else if (code==V3ErrorCode::EC_FATALSRC) return true;
@@ -124,6 +125,7 @@ string V3Error::msgPrefix() {
     V3ErrorCode code=s_errorCode;
     bool supp=s_errorSuppressed;
     if (supp) return "-arning-suppressed: ";
+    else if (code==V3ErrorCode::USERINFO) return "-Info: ";
     else if (code==V3ErrorCode::EC_INFO) return "-Info: ";
     else if (code==V3ErrorCode::EC_FATAL) return "%Error: ";
     else if (code==V3ErrorCode::EC_FATALSRC) return "%Error: Internal Error: ";
@@ -175,7 +177,8 @@ void V3Error::v3errorEnd (ostringstream& sstr) {
     s_messages.insert(msg);
     // Output
     cerr<<msg;
-    if (!s_errorSuppressed && s_errorCode!=V3ErrorCode::EC_INFO) {
+    if (!s_errorSuppressed && !(s_errorCode==V3ErrorCode::EC_INFO
+				|| s_errorCode==V3ErrorCode::USERINFO)) {
 	if (!s_describedEachWarn[s_errorCode]
 	    && !s_pretendError[s_errorCode]) {
 	    s_describedEachWarn[s_errorCode] = true;
diff --git a/test_regress/t/t_assert_elab.v b/test_regress/t/t_assert_elab.v
index ae07b536a..98283bbab 100644
--- a/test_regress/t/t_assert_elab.v
+++ b/test_regress/t/t_assert_elab.v
@@ -6,6 +6,7 @@
 module t;
    localparam str = "string";
    function logic checkParameter(input logic [8:0] N);
+      $display("x is %d.", N);
       if (N == 1)
         return 0;
       $fatal(1, "Parameter %d is invalid...%s and %s", N, str, "constant both work");