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

Author: firewave

CMakeLists.txt

@@ -75,9 +75,10 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 
     # TODO: check for proper AppleClang version
     # we do not add the annotation until C++20
-    # the warning was introduced with Clang 23
+    # the warnings was introduced with Clang 23
     if(CMAKE_CXX_STANDARD LESS 20)
         add_compile_options_safe(-Wno-lifetime-safety-intra-tu-suggestions)
+        add_compile_options_safe(-Wno-lifetime-safety-cross-tu-suggestions)
     endif()
 
     # TODO: fix these?

simplecpp.cpp

@@ -389,7 +389,7 @@ namespace {
     class StdCharBufStream : public simplecpp::TokenList::Stream {
     public:
         // cppcheck-suppress uninitDerivedMemberVar - we call Stream::init() to initialize the private members
-        StdCharBufStream(const unsigned char* str, std::size_t size)
+        StdCharBufStream(const unsigned char* str SIMPLECPP_LIFETIMEBOUND, std::size_t size)
             : str(str)
             , size(size)
         {
@@ -1508,12 +1508,12 @@ namespace simplecpp {
 
     class Macro {
     public:
-        explicit Macro(std::vector<std::string> &f) : nameTokDef(nullptr), valueToken(nullptr), endToken(nullptr), files(f), tokenListDefine(f), variadic(false), variadicOpt(false), valueDefinedInCode_(false) {}
+        explicit Macro(std::vector<std::string> &f SIMPLECPP_LIFETIMEBOUND) : nameTokDef(nullptr), valueToken(nullptr), endToken(nullptr), files(f), tokenListDefine(f), variadic(false), variadicOpt(false), valueDefinedInCode_(false) {}
 
         /**
          * @throws std::runtime_error thrown on bad macro syntax
          */
-        Macro(const Token *tok, std::vector<std::string> &f) : nameTokDef(nullptr), files(f), tokenListDefine(f), valueDefinedInCode_(true) {
+        Macro(const Token *tok, std::vector<std::string> &f SIMPLECPP_LIFETIMEBOUND) : nameTokDef(nullptr), files(f), tokenListDefine(f), valueDefinedInCode_(true) {
             if (sameline(tok->previousSkipComments(), tok))
                 throw std::runtime_error("bad macro syntax");
             if (tok->op != '#')

simplecpp.h

@@ -88,20 +88,20 @@ namespace simplecpp {
     struct View
     {
         // cppcheck-suppress noExplicitConstructor
-        View(const char* data)
+        View(const char* data SIMPLECPP_LIFETIMEBOUND)
             : mData(data)
             , mSize(strlen(data))
         {}
 
         // only provide when std::span is not available so using untyped initialization won't use View
 #if !defined(__cpp_lib_span)
-        View(const char* data, std::size_t size)
+        View(const char* data SIMPLECPP_LIFETIMEBOUND, std::size_t size)
             : mData(data)
             , mSize(size)
         {}
 
         // cppcheck-suppress noExplicitConstructor
-        View(const std::string& str)
+        View(const std::string& str SIMPLECPP_LIFETIMEBOUND)
             : mData(str.data())
             , mSize(str.size())
         {}
@@ -269,9 +269,9 @@ namespace simplecpp {
     public:
         class Stream;
 
-        explicit TokenList(std::vector<std::string> &filenames);
+        explicit TokenList(std::vector<std::string> &filenames SIMPLECPP_LIFETIMEBOUND);
         /** generates a token list from the given std::istream parameter */
-        TokenList(std::istream &istr, std::vector<std::string> &filenames, const std::string &filename=std::string(), OutputList *outputList = nullptr);
+        TokenList(std::istream &istr, std::vector<std::string> &filenames SIMPLECPP_LIFETIMEBOUND, const std::string &filename=std::string(), OutputList *outputList = nullptr);
         /** generates a token list from the given buffer */
         template<size_t size>
         TokenList(const char (&data)[size], std::vector<std::string> &filenames, const std::string &filename=std::string(), OutputList *outputList = nullptr)
@@ -309,7 +309,7 @@ namespace simplecpp {
 #endif // __cpp_lib_span
 
         /** generates a token list from the given filename parameter */
-        TokenList(const std::string &filename, std::vector<std::string> &filenames, OutputList *outputList = nullptr);
+        TokenList(const std::string &filename, std::vector<std::string> &filenames SIMPLECPP_LIFETIMEBOUND, OutputList *outputList = nullptr);
         TokenList(const TokenList &other);
         TokenList(TokenList &&other);
         ~TokenList();
@@ -389,7 +389,7 @@ namespace simplecpp {
         const std::string& file(const Location& loc) const;
 
     private:
-        TokenList(const unsigned char* data, std::size_t size, std::vector<std::string> &filenames, const std::string &filename, OutputList *outputList, int /*unused*/);
+        TokenList(const unsigned char* data, std::size_t size, std::vector<std::string> &filenames SIMPLECPP_LIFETIMEBOUND, const std::string &filename, OutputList *outputList, int /*unused*/);
 
         void combineOperators();
 

test.cpp

@@ -22,6 +22,16 @@
 #error "SIMPLECPP_TEST_SOURCE_DIR is not defined."
 #endif
 
+#if defined(__has_cpp_attribute)
+#  if __has_cpp_attribute (clang::lifetimebound)
+#    define SIMPLECPP_LIFETIMEBOUND [[clang::lifetimebound]]
+#  else
+#    define SIMPLECPP_LIFETIMEBOUND
+#  endif
+#else
+#  define SIMPLECPP_LIFETIMEBOUND
+#endif
+
 #define STRINGIZE_(x) #x
 #define STRINGIZE(x) STRINGIZE_(x)
 
@@ -101,7 +111,7 @@ static void testcase(const std::string &name, void (*const f)(), int argc, char
 
 #define TEST_CASE(F)    (testcase(#F, F, argc, argv))
 
-static simplecpp::TokenList makeTokenList(const char code[], std::size_t size, std::vector<std::string> &filenames, const std::string &filename=std::string(), simplecpp::OutputList * const outputList=nullptr)
+static simplecpp::TokenList makeTokenList(const char code[], std::size_t size, std::vector<std::string> &filenames, const std::string &filename=std::string(), simplecpp::OutputList * const outputList SIMPLECPP_LIFETIMEBOUND = nullptr)
 {
     switch (USE_INPUT) {
     case Input::Stringstream: {