Fix optimization problem in GCC 8 -O3

Author: biojppm

src/c4/yml/detail/dbgprint.hpp

@@ -54,6 +54,9 @@
 #define RYML_LOGBUF_SIZE_MAX RYML_ERRMSG_SIZE
 
 #include <c4/dump.hpp>
+
+C4_SUPPRESS_WARNING_GCC_WITH_PUSH("-Wattributes")
+
 namespace c4 {
 inline bool& _dbg_enabled() { static bool enabled = true; return enabled; }
 inline C4_NO_INLINE void _dbg_set_enabled(bool yes) { _dbg_enabled() = yes; }
@@ -153,6 +156,8 @@ inline C4_NO_INLINE void __c4presc(const char *s, size_t len, bool keep_newlines
 }
 } // namespace c4
 
+C4_SUPPRESS_WARNING_GCC_POP
+
 #endif // RYML_DBG
 
 #endif /* _C4_YML_DETAIL_DBGPRINT_HPP_ */

src/c4/yml/parse_engine.def.hpp

@@ -1984,14 +1984,15 @@ typename ParseEngine<EventHandler>::ScannedScalar ParseEngine<EventHandler>::_sc
 
     size_t numlines = 1; // we already have one line
     size_t pos = npos; // find the pos of the matching quote
+    auto *st = m_evt_handler->m_curr; // prevent erroneous hoist of the assignment out of the loop
     while( ! _finished_file())
     {
-        const csubstr line = m_evt_handler->m_curr->line_contents.rem;
-        #if defined(__GNUC__) && __GNUC__ == 11
+        const csubstr line = st->line_contents.rem;
+        #if defined(__GNUC__) && (__GNUC__ == 11 || __GNUC__ == 8)
         C4_DONT_OPTIMIZE(line); // prevent erroneous hoist of the assignment out of the loop
         #endif
         bool line_is_blank = true;
-        _c4dbgpf("scanning double quoted scalar @ line[{}]:  line='{}'", m_evt_handler->m_curr->pos.line, line);
+        _c4dbgpf("scanning double quoted scalar @ line[{}]:  line='{}'", st->pos.line, line);
         for(size_t i = 0; i < line.len; ++i)
         {
             const char curr = line.str[i];
@@ -2026,9 +2027,9 @@ typename ParseEngine<EventHandler>::ScannedScalar ParseEngine<EventHandler>::_sc
         else
         {
             _RYML_ASSERT_BASIC_(m_evt_handler->m_stack.m_callbacks, pos >= 0 && pos < m_buf.len);
-            _RYML_ASSERT_BASIC_(m_evt_handler->m_stack.m_callbacks, m_buf[m_evt_handler->m_curr->pos.offset + pos] == '"');
+            _RYML_ASSERT_BASIC_(m_evt_handler->m_stack.m_callbacks, m_buf[st->pos.offset + pos] == '"');
             _line_progressed(pos + 1); // progress beyond the quote
-            pos = m_evt_handler->m_curr->pos.offset - b - 1; // but we stop before it
+            pos = st->pos.offset - b - 1; // but we stop before it
             break;
         }
 
@@ -2050,7 +2051,7 @@ typename ParseEngine<EventHandler>::ScannedScalar ParseEngine<EventHandler>::_sc
 
     _c4prscalar("scanned dquoted scalar", s, /*keep_newlines*/true);
 
-    return ScannedScalar { s, needs_filter };
+    return ScannedScalar{s, needs_filter};
 }
 
 

src_extra/c4/yml/extra/event_handler_ints.hpp

@@ -971,13 +971,13 @@ struct EventHandlerInts : public c4::yml::EventHandlerStack<EventHandlerInts, Ev
 
     C4_ALWAYS_INLINE void set_key_scalar_dquoted(csubstr scalar)
     {
-        _c4dbgpf("{}/{}: set_key_scalar_dquo: @{} [{}]~~~{}~~~", m_evt_pos, m_evt_size, scalar.str-m_src.str, scalar.len, scalar);
+        _c4dbgpf("{}/{}: set_key_scalar_dquo: @{} [{}]~~~{}~~~", m_evt_pos, m_evt_size, scalar.str?scalar.str-m_src.str:m_src.len, scalar.len, scalar.str?scalar:csubstr{});
         _send_key_scalar_(scalar, ievt::DQUO);
         _enable_(c4::yml::KEY|c4::yml::KEY_DQUO);
     }
     C4_ALWAYS_INLINE void set_val_scalar_dquoted(csubstr scalar)
     {
-        _c4dbgpf("{}/{}: set_val_scalar_dquo: @{} [{}]~~~{}~~~", m_evt_pos, m_evt_size, scalar.str-m_src.str, scalar.len, scalar);
+        _c4dbgpf("{}/{}: set_val_scalar_dquo: @{} [{}]~~~{}~~~", m_evt_pos, m_evt_size, scalar.str?scalar.str-m_src.str:m_src.len, scalar.len, scalar.str?scalar:csubstr{});
         _send_val_scalar_(scalar, ievt::DQUO);
         _enable_(c4::yml::VAL|c4::yml::VAL_DQUO);
     }
@@ -999,27 +999,27 @@ struct EventHandlerInts : public c4::yml::EventHandlerStack<EventHandlerInts, Ev
 
     C4_ALWAYS_INLINE void set_key_scalar_literal(csubstr scalar)
     {
-        _c4dbgpf("{}/{}: set_key_scalar_literal: @{} [{}]~~~{}~~~", m_evt_pos, m_evt_size, scalar.str-m_src.str, scalar.len, scalar);
+        _c4dbgpf("{}/{}: set_key_scalar_literal: @{} [{}]~~~{}~~~", m_evt_pos, m_evt_size, scalar.str?scalar.str-m_src.str:m_src.len, scalar.len, scalar.str?scalar:csubstr{});
         _send_key_scalar_(scalar, ievt::LITL);
         _enable_(c4::yml::KEY|c4::yml::KEY_LITERAL);
     }
     C4_ALWAYS_INLINE void set_val_scalar_literal(csubstr scalar)
     {
-        _c4dbgpf("{}/{}: set_val_scalar_literal: @{} [{}]~~~{}~~~", m_evt_pos, m_evt_size, scalar.str-m_src.str, scalar.len, scalar);
+        _c4dbgpf("{}/{}: set_val_scalar_literal: @{} [{}]~~~{}~~~", m_evt_pos, m_evt_size, scalar.str?scalar.str-m_src.str:m_src.len, scalar.len, scalar.str?scalar:csubstr{});
         _send_val_scalar_(scalar, ievt::LITL);
         _enable_(c4::yml::VAL|c4::yml::VAL_LITERAL);
     }
 
 
     C4_ALWAYS_INLINE void set_key_scalar_folded(csubstr scalar)
     {
-        _c4dbgpf("{}/{}: set_key_scalar_folded: @{} [{}]~~~{}~~~", m_evt_pos, m_evt_size, scalar.str-m_src.str, scalar.len, scalar);
+        _c4dbgpf("{}/{}: set_key_scalar_folded: @{} [{}]~~~{}~~~", m_evt_pos, m_evt_size, scalar.str?scalar.str-m_src.str:m_src.len, scalar.len, scalar.str?scalar:csubstr{});
         _send_key_scalar_(scalar, ievt::FOLD);
         _enable_(c4::yml::KEY|c4::yml::KEY_FOLDED);
     }
     C4_ALWAYS_INLINE void set_val_scalar_folded(csubstr scalar)
     {
-        _c4dbgpf("{}/{}: set_val_scalar_folded: @{} [{}]~~~{}~~~", m_evt_pos, m_evt_size, scalar.str-m_src.str, scalar.len, scalar);
+        _c4dbgpf("{}/{}: set_val_scalar_folded: @{} [{}]~~~{}~~~", m_evt_pos, m_evt_size, scalar.str?scalar.str-m_src.str:m_src.len, scalar.len, scalar.str?scalar:csubstr{});
         _send_val_scalar_(scalar, ievt::FOLD);
         _enable_(c4::yml::VAL|c4::yml::VAL_FOLDED);
     }

test/test_lib/test_engine.hpp

@@ -478,13 +478,16 @@ void name##_impl(EvtHandlerClass &ps)
 #if !defined(RYML_DBG)
 #define ___(stmt) stmt
 #else
+
 #define ___(stmt)                       \
     do                                  \
     {                                   \
        stmt;                            \
        _print_handler_info(ps, #stmt, __FILE__, __LINE__);  \
     } while(0)
 
+C4_SUPPRESS_WARNING_GCC_WITH_PUSH("-Wattributes")
+
 inline C4_NO_INLINE void _print_handler_info(EventHandlerTree const& ps, csubstr stmt, const char *file, int line)
 {
     if(ps.m_parent)
@@ -529,6 +532,9 @@ inline C4_NO_INLINE void _print_handler_info(EventTransformer<Handler, Transform
 {
     _print_handler_info(ps.handler, stmt, file, line);
 }
+
+C4_SUPPRESS_WARNING_GCC_WITH_PUSH("-Wattributes")
+
 #endif
 
 } // namespace yml