[llvm] 3125887 - [Remarks] Fix gcc build

[Francis Visoiu Mistrih via llvm-commits]

Author: Francis Visoiu Mistrih
Date: 2020-02-04T17:43:59-08:00
New Revision: 3125887845ca22e6bedf3c5be49129a7ec600ee1

URL: https://github.com/llvm/llvm-project/commit/3125887845ca22e6bedf3c5be49129a7ec600ee1
DIFF: https://github.com/llvm/llvm-project/commit/3125887845ca22e6bedf3c5be49129a7ec600ee1.diff

LOG: [Remarks] Fix gcc build

Added: 
    

Modified: 
    llvm/include/llvm/IR/LLVMContext.h
    llvm/lib/IR/LLVMContext.cpp
    llvm/lib/IR/LLVMContextImpl.h

Removed: 
    


################################################################################
diff  --git a/llvm/include/llvm/IR/LLVMContext.h b/llvm/include/llvm/IR/LLVMContext.h
index a6dbf2b671c5..41c25c563f70 100644
--- a/llvm/include/llvm/IR/LLVMContext.h
+++ b/llvm/include/llvm/IR/LLVMContext.h
@@ -232,7 +232,7 @@ class LLVMContext {
   remarks::RemarkStreamer *getMainRemarkStreamer();
   const remarks::RemarkStreamer *getMainRemarkStreamer() const;
   void setMainRemarkStreamer(
-      std::unique_ptr<remarks::RemarkStreamer> LLVMRemarkStreamer);
+      std::unique_ptr<remarks::RemarkStreamer> MainRemarkStreamer);
 
   /// The "LLVM remark streamer" used by LLVM to serialize remark diagnostics
   /// comming from IR and MIR passes.
@@ -242,7 +242,7 @@ class LLVMContext {
   LLVMRemarkStreamer *getLLVMRemarkStreamer();
   const LLVMRemarkStreamer *getLLVMRemarkStreamer() const;
   void
-  setLLVMRemarkStreamer(std::unique_ptr<LLVMRemarkStreamer> LLVMRemarkStreamer);
+  setLLVMRemarkStreamer(std::unique_ptr<LLVMRemarkStreamer> RemarkStreamer);
 
   /// Get the prefix that should be printed in front of a diagnostic of
   ///        the given \p Severity

diff  --git a/llvm/lib/IR/LLVMContext.cpp b/llvm/lib/IR/LLVMContext.cpp
index 30b17ebdd7d5..604f549afe63 100644
--- a/llvm/lib/IR/LLVMContext.cpp
+++ b/llvm/lib/IR/LLVMContext.cpp
@@ -155,14 +155,14 @@ void LLVMContext::setMainRemarkStreamer(
 }
 
 LLVMRemarkStreamer *LLVMContext::getLLVMRemarkStreamer() {
-  return pImpl->LLVMRemarkStreamer.get();
+  return pImpl->LLVMRS.get();
 }
 const LLVMRemarkStreamer *LLVMContext::getLLVMRemarkStreamer() const {
   return const_cast<LLVMContext *>(this)->getLLVMRemarkStreamer();
 }
 void LLVMContext::setLLVMRemarkStreamer(
     std::unique_ptr<LLVMRemarkStreamer> RemarkStreamer) {
-  pImpl->LLVMRemarkStreamer = std::move(RemarkStreamer);
+  pImpl->LLVMRS = std::move(RemarkStreamer);
 }
 
 DiagnosticHandler::DiagnosticHandlerTy

diff  --git a/llvm/lib/IR/LLVMContextImpl.h b/llvm/lib/IR/LLVMContextImpl.h
index c18ca4ac642c..e912c4ba1f70 100644
--- a/llvm/lib/IR/LLVMContextImpl.h
+++ b/llvm/lib/IR/LLVMContextImpl.h
@@ -1255,7 +1255,7 @@ class LLVMContextImpl {
   bool DiagnosticsHotnessRequested = false;
   uint64_t DiagnosticsHotnessThreshold = 0;
   /// The specialized remark streamer used by LLVM's OptimizationRemarkEmitter.
-  std::unique_ptr<LLVMRemarkStreamer> LLVMRemarkStreamer;
+  std::unique_ptr<LLVMRemarkStreamer> LLVMRS;
 
   LLVMContext::YieldCallbackTy YieldCallback = nullptr;
   void *YieldOpaqueHandle = nullptr;