From 13b50bacfee1ea1651cbdccd7522f3d03cab5675 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Sun, 25 Jan 2015 22:57:09 +0100 Subject: [PATCH] Rethrow with "catch(...) throw;" --- kernel/yosys.cc | 4 ++-- passes/cmds/tee.cc | 4 ++-- passes/cmds/trace.cc | 4 ++-- 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 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 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); -- 2.30.2