diff options
| author | Gabe Black <gabeblack@google.com> | 2018-09-27 01:16:42 -0700 |
|---|---|---|
| committer | Gabe Black <gabeblack@google.com> | 2018-10-16 00:38:23 +0000 |
| commit | 5bdeb1a432430dcb265cef77fa9365eceddce7d7 (patch) | |
| tree | 83cd6f4e0601dd52e2d226e1b8fe61e8696c2f0f /src/systemc/core/scheduler.cc | |
| parent | 07cad60bb0865d95cfe4c5ce2ea08d7c8d33f34f (diff) | |
| download | gem5-5bdeb1a432430dcb265cef77fa9365eceddce7d7.tar.xz | |
systemc: Modify reportifyException to keep sc_reports in scope.
reportifyException was sometimes indirectly creating temporary
sc_report objects which would go out of scope when they were
returned. The later code which tried to print them would then read
garbage.
Change-Id: I0a744eb029c62bf2ffee83db0a0e6dcbe3e60f7d
Reviewed-on: https://gem5-review.googlesource.com/c/13190
Reviewed-by: Gabe Black <gabeblack@google.com>
Maintainer: Gabe Black <gabeblack@google.com>
Diffstat (limited to 'src/systemc/core/scheduler.cc')
| -rw-r--r-- | src/systemc/core/scheduler.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/systemc/core/scheduler.cc b/src/systemc/core/scheduler.cc index fe1d7c2e4..d57505517 100644 --- a/src/systemc/core/scheduler.cc +++ b/src/systemc/core/scheduler.cc @@ -418,11 +418,10 @@ Scheduler::schedulePause() } void -Scheduler::throwToScMain(const ::sc_core::sc_report *r) +Scheduler::throwToScMain() { - if (!r) - r = reportifyException(); - _throwToScMain = r; + ::sc_core::sc_report report = reportifyException(); + _throwToScMain = &report; status(StatusOther); scMain->run(); } @@ -462,7 +461,7 @@ throwingReportHandler(const ::sc_core::sc_report &r, } // anonymous namespace -const ::sc_core::sc_report * +const ::sc_core::sc_report reportifyException() { ::sc_core::sc_report_handler_proc old_handler = @@ -488,7 +487,7 @@ reportifyException() } } catch (const ::sc_core::sc_report &r) { ::sc_core::sc_report_handler::set_handler(old_handler); - return &r; + return r; } panic("No exception thrown in reportifyException."); } |