[clang] [clang][ssaf] Workaround gcc-7 NRVO bug (PR #186897)

[via cfe-commits]

llvmbot wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-clang-ssaf

Author: Balázs Benics (steakhal)

<details>
<summary>Changes</summary>

Addresses:
https://github.com/llvm/llvm-project/pull/186156#issuecomment-4070258854

---
Full diff: https://github.com/llvm/llvm-project/pull/186897.diff


2 Files Affected:

- (modified) clang/include/clang/ScalableStaticAnalysisFramework/Core/SummaryData/SummaryDataStore.h (+1-1) 
- (modified) clang/lib/ScalableStaticAnalysisFramework/Core/SummaryData/LUSummaryConsumer.cpp (+1-1) 


``````````diff
diff --git a/clang/include/clang/ScalableStaticAnalysisFramework/Core/SummaryData/SummaryDataStore.h b/clang/include/clang/ScalableStaticAnalysisFramework/Core/SummaryData/SummaryDataStore.h
index f817dda9745c11..2d20696c65cf3f 100644
--- a/clang/include/clang/ScalableStaticAnalysisFramework/Core/SummaryData/SummaryDataStore.h
+++ b/clang/include/clang/ScalableStaticAnalysisFramework/Core/SummaryData/SummaryDataStore.h
@@ -106,7 +106,7 @@ class SummaryDataStore {
     }
     auto Ptr = std::move(It->second);
     Data.erase(It);
-    return Ptr;
+    return std::move(Ptr);
   }
 };
 
diff --git a/clang/lib/ScalableStaticAnalysisFramework/Core/SummaryData/LUSummaryConsumer.cpp b/clang/lib/ScalableStaticAnalysisFramework/Core/SummaryData/LUSummaryConsumer.cpp
index e6f21d8c54799e..79b1e23bdd9e8a 100644
--- a/clang/lib/ScalableStaticAnalysisFramework/Core/SummaryData/LUSummaryConsumer.cpp
+++ b/clang/lib/ScalableStaticAnalysisFramework/Core/SummaryData/LUSummaryConsumer.cpp
@@ -55,7 +55,7 @@ LUSummaryConsumer::run(llvm::ArrayRef<SummaryName> Names) {
     }
     Store.Data.emplace(SN, std::move(*Result));
   }
-  return Store;
+  return std::move(Store);
 }
 
 SummaryDataStore LUSummaryConsumer::run() && {

``````````

</details>


https://github.com/llvm/llvm-project/pull/186897