diff options
Diffstat (limited to 'gcc/diagnostic.cc')
| -rw-r--r-- | gcc/diagnostic.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/gcc/diagnostic.cc b/gcc/diagnostic.cc index 82d7f94..07c76b6 100644 --- a/gcc/diagnostic.cc +++ b/gcc/diagnostic.cc @@ -1398,18 +1398,6 @@ diagnostic_context::report_diagnostic (diagnostic_info *diagnostic) if (diagnostic->kind == DK_NOTE && m_inhibit_notes_p) return false; - if (m_lock > 0) - { - /* If we're reporting an ICE in the middle of some other error, - try to flush out the previous error, then let this one - through. Don't do this more than once. */ - if ((diagnostic->kind == DK_ICE || diagnostic->kind == DK_ICE_NOBT) - && m_lock == 1) - pp_newline_and_flush (m_reference_printer); - else - error_recursion (); - } - /* If the user requested that warnings be treated as errors, so be it. Note that we do this before the next block so that individual warnings can be overridden back to warnings with @@ -1437,6 +1425,18 @@ diagnostic_context::report_diagnostic (diagnostic_info *diagnostic) if (diagnostic->kind != DK_NOTE && diagnostic->kind != DK_ICE) check_max_errors (false); + if (m_lock > 0) + { + /* If we're reporting an ICE in the middle of some other error, + try to flush out the previous error, then let this one + through. Don't do this more than once. */ + if ((diagnostic->kind == DK_ICE || diagnostic->kind == DK_ICE_NOBT) + && m_lock == 1) + pp_newline_and_flush (m_reference_printer); + else + error_recursion (); + } + m_lock++; if (diagnostic->kind == DK_ICE || diagnostic->kind == DK_ICE_NOBT) |