fixed -Wlifetime-safety-intra-tu-suggestions Clang warnings

Author: firewave

CMakeLists.txt

@@ -73,8 +73,11 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     add_compile_options_safe(-Wno-thread-safety-negative)
     add_compile_options_safe(-Wno-thread-safety-beta)
 
-    # TODO: enable
-    add_compile_options_safe(-Wno-lifetime-safety-intra-tu-suggestions)
+    # we do not add the annotation until C++20
+    # the warnings were introduced with Clang 23
+    if(CMAKE_CXX_STANDARD LESS 20)
+        add_compile_options_safe(-Wno-lifetime-safety-intra-tu-suggestions)
+    endif()
     add_compile_options_safe(-Wno-lifetime-safety-intra-tu-constructor-suggestions)
     add_compile_options_safe(-Wno-lifetime-safety-cross-tu-constructor-suggestions)
 
@@ -88,6 +91,7 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     # we are not interested in these
     set_source_files_properties(test.cpp PROPERTIES COMPILE_FLAGS "-Wno-multichar -Wno-four-char-constants")
 
+    # TODO: check for proper AppleClang version
     if (CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 14 OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 14)
         # TODO: verify this regression still exists in clang-15
         if (CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")

simplecpp.cpp

@@ -1689,7 +1689,7 @@ namespace simplecpp {
         }
 
         /** how has this macro been used so far */
-        const std::list<Location> &usage() const {
+        const std::list<Location> &usage() const SIMPLECPP_LIFETIMEBOUND {
             return usageList;
         }
 
@@ -1884,7 +1884,7 @@ namespace simplecpp {
 
         const Token *appendTokens(TokenList &tokens,
                                   const Location &rawloc,
-                                  const Token * const lpar,
+                                  const Token * const lpar SIMPLECPP_LIFETIMEBOUND,
                                   const MacroMap &macros,
                                   const std::set<TokenString> &expandedmacros,
                                   const std::vector<const Token*> &parametertokens) const {
@@ -3011,7 +3011,7 @@ static long long evaluate(simplecpp::TokenList &expr, const simplecpp::DUI &dui,
     return expr.cfront() && expr.cfront() == expr.cback() && expr.cfront()->number ? stringToLL(expr.cfront()->str()) : 0LL;
 }
 
-static const simplecpp::Token *gotoNextLine(const simplecpp::Token *tok)
+static const simplecpp::Token *gotoNextLine(const simplecpp::Token *tok SIMPLECPP_LIFETIMEBOUND)
 {
     const unsigned int line = tok->location.line;
     const unsigned int file = tok->location.fileIndex;

simplecpp.h

@@ -172,7 +172,7 @@ namespace simplecpp {
 
         Token &operator=(const Token &tok) = delete;
 
-        const TokenString& str() const {
+        const TokenString& str() const SIMPLECPP_LIFETIMEBOUND {
             return string;
         }
         void setstr(const std::string &s) {
@@ -493,22 +493,22 @@ namespace simplecpp {
         size_type size() const {
             return mData.size();
         }
-        iterator begin() {
+        iterator begin() SIMPLECPP_LIFETIMEBOUND {
             return mData.begin();
         }
-        iterator end() {
+        iterator end() SIMPLECPP_LIFETIMEBOUND {
             return mData.end();
         }
-        const_iterator begin() const {
+        const_iterator begin() const SIMPLECPP_LIFETIMEBOUND {
             return mData.begin();
         }
-        const_iterator end() const {
+        const_iterator end() const SIMPLECPP_LIFETIMEBOUND {
             return mData.end();
         }
-        const_iterator cbegin() const {
+        const_iterator cbegin() const SIMPLECPP_LIFETIMEBOUND {
             return mData.cbegin();
         }
-        const_iterator cend() const {
+        const_iterator cend() const SIMPLECPP_LIFETIMEBOUND {
             return mData.cend();
         }