aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClifford Wolf <clifford@clifford.at>2015-01-25 22:57:09 +0100
committerClifford Wolf <clifford@clifford.at>2015-01-25 22:57:09 +0100
commit13b50bacfee1ea1651cbdccd7522f3d03cab5675 (patch)
tree9189a9a8c89601aa51a4a17e88cd37283427a1a6
parentacfaeb8d34f6be33e09f780159a6ec702357697d (diff)
downloadyosys-13b50bacfee1ea1651cbdccd7522f3d03cab5675.tar.gz
yosys-13b50bacfee1ea1651cbdccd7522f3d03cab5675.tar.bz2
yosys-13b50bacfee1ea1651cbdccd7522f3d03cab5675.zip
Rethrow with "catch(...) throw;"
-rw-r--r--kernel/yosys.cc4
-rw-r--r--passes/cmds/tee.cc4
-rw-r--r--passes/cmds/trace.cc4
3 files changed, 6 insertions, 6 deletions
diff --git a/kernel/yosys.cc b/kernel/yosys.cc
index d5467afe1..b280d3344 100644
--- a/kernel/yosys.cc
+++ b/kernel/yosys.cc
@@ -720,9 +720,9 @@ void run_frontend(std::string filename, std::string command, RTLIL::Design *desi
Pass::call(design, command);
}
}
- catch (log_cmd_error_exception) {
+ catch (...) {
Frontend::current_script_file = backup_script_file;
- throw log_cmd_error_exception();
+ throw;
}
Frontend::current_script_file = backup_script_file;
diff --git a/passes/cmds/tee.cc b/passes/cmds/tee.cc
index e83c93871..a0484090f 100644
--- a/passes/cmds/tee.cc
+++ b/passes/cmds/tee.cc
@@ -76,11 +76,11 @@ struct TeePass : public Pass {
try {
std::vector<std::string> new_args(args.begin() + argidx, args.end());
Pass::call(design, new_args);
- } catch (log_cmd_error_exception) {
+ } catch (...) {
for (auto cf : files_to_close)
fclose(cf);
log_files = backup_log_files;
- throw log_cmd_error_exception();
+ throw;
}
for (auto cf : files_to_close)
diff --git a/passes/cmds/trace.cc b/passes/cmds/trace.cc
index e05fedb35..1a5f873ff 100644
--- a/passes/cmds/trace.cc
+++ b/passes/cmds/trace.cc
@@ -85,9 +85,9 @@ struct TracePass : public Pass {
try {
std::vector<std::string> new_args(args.begin() + argidx, args.end());
Pass::call(design, new_args);
- } catch (log_cmd_error_exception) {
+ } catch (...) {
design->monitors.erase(&monitor);
- throw log_cmd_error_exception();
+ throw;
}
design->monitors.erase(&monitor);