aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/log.cc
diff options
context:
space:
mode:
authorClifford Wolf <clifford@clifford.at>2019-05-27 13:24:19 +0200
committerGitHub <noreply@github.com>2019-05-27 13:24:19 +0200
commit2a9c68e2d6e0d58ac9e1ef8e8eb4c21eb979b380 (patch)
treee68672f6a6b667fc1561905ed1f0078c08cc81b7 /kernel/log.cc
parentda140dd2602a049a94473f5f262189b22e19c185 (diff)
parente3f9ccf56d65ba72dfa625e9716d1182f36a381e (diff)
downloadyosys-2a9c68e2d6e0d58ac9e1ef8e8eb4c21eb979b380.tar.gz
yosys-2a9c68e2d6e0d58ac9e1ef8e8eb4c21eb979b380.tar.bz2
yosys-2a9c68e2d6e0d58ac9e1ef8e8eb4c21eb979b380.zip
Merge pull request #1026 from YosysHQ/clifford/fix1023
Keep zero-width wires in opt_clean if and only if they are ports
Diffstat (limited to 'kernel/log.cc')
-rw-r--r--kernel/log.cc9
1 files changed, 9 insertions, 0 deletions
diff --git a/kernel/log.cc b/kernel/log.cc
index 9a9104e26..fa74a6a3c 100644
--- a/kernel/log.cc
+++ b/kernel/log.cc
@@ -230,6 +230,9 @@ static void logv_warning_with_prefix(const char *prefix,
}
else
{
+ int bak_log_make_debug = log_make_debug;
+ log_make_debug = 0;
+
for (auto &re : log_werror_regexes)
if (std::regex_search(message, re))
log_error("%s", message.c_str());
@@ -254,6 +257,7 @@ static void logv_warning_with_prefix(const char *prefix,
}
log_warnings_count++;
+ log_make_debug = bak_log_make_debug;
}
}
@@ -285,6 +289,9 @@ static void logv_error_with_prefix(const char *prefix,
#ifdef EMSCRIPTEN
auto backup_log_files = log_files;
#endif
+ int bak_log_make_debug = log_make_debug;
+ log_make_debug = 0;
+ log_suppressed();
if (log_errfile != NULL)
log_files.push_back(log_errfile);
@@ -298,6 +305,8 @@ static void logv_error_with_prefix(const char *prefix,
log("%s%s", prefix, log_last_error.c_str());
log_flush();
+ log_make_debug = bak_log_make_debug;
+
if (log_error_atexit)
log_error_atexit();