From afa9036dda4a7984919266db118dbb79c19c47af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20H=C3=B6rmann?= <mhoermann@gmail.com>
Date: Sat, 22 Jun 2024 14:38:47 +0200
Subject: [PATCH] annotate GCC 13 -Wdangling reference false positives so they
 are ignored

---
 indra/llui/llfloaterreg.h              | 11 +++++++++++
 indra/newview/llpathfindingnavmesh.cpp | 11 +++++++++++
 indra/newview/rlvcommon.cpp            |  7 +++++++
 indra/newview/rlvhandler.cpp           |  7 +++++++
 4 files changed, 36 insertions(+)

diff --git a/indra/llui/llfloaterreg.h b/indra/llui/llfloaterreg.h
index c30e6afe7a..9f8a15f54d 100644
--- a/indra/llui/llfloaterreg.h
+++ b/indra/llui/llfloaterreg.h
@@ -123,7 +123,18 @@ public:
     static bool destroyInstance(const std::string& name, const LLSD& key = LLSD());
 
     // Iterators
+    // <FS> ignore dangling reference false positives in gcc13
+#if defined(__GNUC__) && (__GNUC__ >= 13)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdangling-reference"
+#endif
+    // </FS>
     static const_instance_list_t& getFloaterList(const std::string& name);
+    // <FS> ignore dangling reference false positives in gcc13
+#if defined(__GNUC__) && (__GNUC__ >= 13)
+#pragma GCC diagnostic pop
+#endif
+    // </FS>
 
     // Visibility Management
 // [RLVa:KB] - Checked: 2012-02-07 (RLVa-1.4.5) | Added: RLVa-1.4.5
diff --git a/indra/newview/llpathfindingnavmesh.cpp b/indra/newview/llpathfindingnavmesh.cpp
index 52a7383da6..5832e47a72 100644
--- a/indra/newview/llpathfindingnavmesh.cpp
+++ b/indra/newview/llpathfindingnavmesh.cpp
@@ -139,7 +139,18 @@ void LLPathfindingNavMesh::handleNavMeshResult(const LLSD &pContent, U32 pNavMes
         ENavMeshRequestStatus status;
         if ( pContent.has(NAVMESH_DATA_FIELD) )
         {
+            // <FS> ignore dangling reference false positives in gcc13
+#if defined(__GNUC__) && (__GNUC__ >= 13)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdangling-reference"
+#endif
+            // </FS>
             const LLSD::Binary &value = pContent.get(NAVMESH_DATA_FIELD).asBinary();
+            // <FS> ignore dangling reference false positives in gcc13
+#if defined(__GNUC__) && (__GNUC__ >= 13)
+#pragma GCC diagnostic pop
+#endif
+            // </FS>
             unsigned int binSize = value.size();
             std::string newStr(reinterpret_cast<const char *>(&value[0]), binSize);
             std::istringstream streamdecomp( newStr );
diff --git a/indra/newview/rlvcommon.cpp b/indra/newview/rlvcommon.cpp
index b64171451d..1d93c91a32 100644
--- a/indra/newview/rlvcommon.cpp
+++ b/indra/newview/rlvcommon.cpp
@@ -490,7 +490,14 @@ void RlvUtil::filterLocation(std::string& strUTF8Text)
 {
     // Filter any mention of the surrounding region names
     LLWorld::region_list_t regions = LLWorld::getInstance()->getRegionList();
+#if defined(__GNUC__) && (__GNUC__ >= 13)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdangling-reference"
+#endif
     const std::string& strHiddenRegion = RlvStrings::getString(RlvStringKeys::Hidden::Region);
+#if defined(__GNUC__) && (__GNUC__ >= 13)
+#pragma GCC diagnostic pop
+#endif
     for (LLWorld::region_list_t::const_iterator itRegion = regions.begin(); itRegion != regions.end(); ++itRegion)
         boost::replace_all_regex(strUTF8Text, boost::regex("\\b" + escape_for_regex((*itRegion)->getName()) + "\\b", boost::regex::icase), strHiddenRegion);
 
diff --git a/indra/newview/rlvhandler.cpp b/indra/newview/rlvhandler.cpp
index f3afeb05b9..476e29d05a 100644
--- a/indra/newview/rlvhandler.cpp
+++ b/indra/newview/rlvhandler.cpp
@@ -374,7 +374,14 @@ void RlvHandler::getAttachmentResourcesCoro(const std::string& strUrl)
             for (LLSD::array_const_iterator itAttachObj = sdAttachObjects.beginArray(), endAttachObj = sdAttachObjects.endArray(); itAttachObj != endAttachObj; ++itAttachObj)
             {
                 const LLUUID idObj = itAttachObj->get("id").asUUID();
+#if defined(__GNUC__) && (__GNUC__ >= 13)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdangling-reference"
+#endif
                 const std::string& strObjName = itAttachObj->get("name").asStringRef();
+#if defined(__GNUC__) && (__GNUC__ >= 13)
+#pragma GCC diagnostic pop
+#endif
 
                 // If it's an attachment, it should be a temporary one (NOTE: we might catch it before it's had a chance to attach)
                 const LLViewerObject* pObj = gObjectList.findObject(idObj);