[llvm] 26d954b - [AsmParser] Avoid instantiating LLVMContext if not needed. Try 2.

[Yevgeny Rouban via llvm-commits]

Author: Yevgeny Rouban
Date: 2023-03-23T16:57:46+07:00
New Revision: 26d954bd4004dd01771308a5061a865073993130

URL: https://github.com/llvm/llvm-project/commit/26d954bd4004dd01771308a5061a865073993130
DIFF: https://github.com/llvm/llvm-project/commit/26d954bd4004dd01771308a5061a865073993130.diff

LOG: [AsmParser] Avoid instantiating LLVMContext if not needed. Try 2.

The deleted copy constructor LLVMContext(LLVMContext &) got its
parameter changed to const to allow the latest clang compiler to
instantiatiate template std::optional<LLVMContext>.

Differential Revision: https://reviews.llvm.org/D142699

Added: 
    

Modified: 
    llvm/include/llvm/IR/LLVMContext.h
    llvm/lib/AsmParser/Parser.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/include/llvm/IR/LLVMContext.h b/llvm/include/llvm/IR/LLVMContext.h
index a8095a5c2fd30..c13a783e86c7a 100644
--- a/llvm/include/llvm/IR/LLVMContext.h
+++ b/llvm/include/llvm/IR/LLVMContext.h
@@ -68,7 +68,7 @@ class LLVMContext {
 public:
   LLVMContextImpl *const pImpl;
   LLVMContext();
-  LLVMContext(LLVMContext &) = delete;
+  LLVMContext(const LLVMContext &) = delete;
   LLVMContext &operator=(const LLVMContext &) = delete;
   ~LLVMContext();
 

diff  --git a/llvm/lib/AsmParser/Parser.cpp b/llvm/lib/AsmParser/Parser.cpp
index 035eea81378e5..eded892f358a8 100644
--- a/llvm/lib/AsmParser/Parser.cpp
+++ b/llvm/lib/AsmParser/Parser.cpp
@@ -28,9 +28,9 @@ static bool parseAssemblyInto(MemoryBufferRef F, Module *M,
   std::unique_ptr<MemoryBuffer> Buf = MemoryBuffer::getMemBuffer(F);
   SM.AddNewSourceBuffer(std::move(Buf), SMLoc());
 
-  LLVMContext Context;
+  std::optional<LLVMContext> OptContext;
   return LLParser(F.getBuffer(), SM, Err, M, Index,
-                  M ? M->getContext() : Context, Slots)
+                  M ? M->getContext() : OptContext.emplace(), Slots)
       .Run(UpgradeDebugInfo, DataLayoutCallback);
 }