WIP: lazy clear of unscoped messages

Author: horenmar

src/catch2/internal/catch_run_context.cpp

@@ -296,6 +296,10 @@ namespace Catch {
         }
 
         {
+            if ( m_clearMessageScopes ) {
+                m_messageScopes.clear();
+                m_clearMessageScopes = false;
+            }
             auto _ = scopedDeactivate( *m_outputRedirect );
             m_reporter->assertionEnded( AssertionStats( result, m_messages, m_totals ) );
         }
@@ -524,9 +528,10 @@ namespace Catch {
 
     void RunContext::assertionPassedFastPath(SourceLineInfo lineInfo) {
         m_lastKnownLineInfo = lineInfo;
-        m_lastAssertionPassed = true;
         ++m_totals.assertions.passed;
-        m_messageScopes.clear();
+        m_lastAssertionPassed = true;
+        m_clearMessageScopes = true;
+        //m_messageScopes.clear();
     }
 
     bool RunContext::aborting() const {

src/catch2/internal/catch_run_context.hpp

@@ -158,6 +158,7 @@ namespace Catch {
         // Caches m_config->abortAfter() to avoid vptr calls/allow inlining
         size_t m_abortAfterXFailedAssertions;
         bool m_lastAssertionPassed = false;
+        bool m_clearMessageScopes = false;
         bool m_shouldReportUnexpected = true;
         // Caches whether `assertionStarting` events should be sent to the reporter.
         bool m_reportAssertionStarting;