[Remarks][NFC] Rename remarks::Serializer to remarks::RemarkSerializer

llvm-svn: 366939

4 files changed, 23 insertions, 21 deletions

diff --git a/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
index 54f6cc2d557..1d22ea8f294 100644
--- a/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
@@ -1349,7 +1349,7 @@ void AsmPrinter::emitRemarksSection(Module &M) {
   RemarkStreamer *RS = M.getContext().getRemarkStreamer();
   if (!RS)
     return;
-  const remarks::Serializer &Serializer = RS->getSerializer();
+  const remarks::RemarkSerializer &RemarkSerializer = RS->getSerializer();
 
   // Switch to the right section: .remarks/__remarks.
   MCSection *RemarksSection =
@@ -1372,7 +1372,7 @@ void AsmPrinter::emitRemarksSection(Module &M) {
   // just use the serialize function with a raw_ostream because of the way
   // MCStreamers work.
   uint64_t StrTabSize =
-      Serializer.StrTab ? Serializer.StrTab->SerializedSize : 0;
+      RemarkSerializer.StrTab ? RemarkSerializer.StrTab->SerializedSize : 0;
   // Emit the total size of the string table (the size itself excluded):
   // little-endian uint64_t.
   // The total size is located after the version number.
@@ -1382,7 +1382,7 @@ void AsmPrinter::emitRemarksSection(Module &M) {
   OutStreamer->EmitBinaryData(
       StringRef(StrTabSizeBuf.data(), StrTabSizeBuf.size()));
 
-  if (const Optional<remarks::StringTable> &StrTab = Serializer.StrTab) {
+  if (const Optional<remarks::StringTable> &StrTab = RemarkSerializer.StrTab) {
     std::vector<StringRef> StrTabStrings = StrTab->serialize();
     // Emit a list of null-terminated strings.
     // Note: the order is important here: the ID used in the remarks corresponds
diff --git a/llvm/lib/IR/RemarkStreamer.cpp b/llvm/lib/IR/RemarkStreamer.cpp
index 2c01c8a0c5e..450453fc680 100644
--- a/llvm/lib/IR/RemarkStreamer.cpp
+++ b/llvm/lib/IR/RemarkStreamer.cpp
@@ -20,9 +20,11 @@
 
 using namespace llvm;
 
-RemarkStreamer::RemarkStreamer(StringRef Filename,
-                               std::unique_ptr<remarks::Serializer> Serializer)
-    : Filename(Filename), PassFilter(), Serializer(std::move(Serializer)) {
+RemarkStreamer::RemarkStreamer(
+    StringRef Filename,
+    std::unique_ptr<remarks::RemarkSerializer> RemarkSerializer)
+    : Filename(Filename), PassFilter(),
+      RemarkSerializer(std::move(RemarkSerializer)) {
   assert(!Filename.empty() && "This needs to be a real filename.");
 }
 
@@ -100,7 +102,7 @@ void RemarkStreamer::emit(const DiagnosticInfoOptimizationBase &Diag) {
   // First, convert the diagnostic to a remark.
   remarks::Remark R = toRemark(Diag);
   // Then, emit the remark through the serializer.
-  Serializer->emit(R);
+  RemarkSerializer->emit(R);
 }
 
 char RemarkSetupFileError::ID = 0;
@@ -133,13 +135,13 @@ llvm::setupOptimizationRemarks(LLVMContext &Context, StringRef RemarksFilename,
   if (Error E = Format.takeError())
     return make_error<RemarkSetupFormatError>(std::move(E));
 
-  Expected<std::unique_ptr<remarks::Serializer>> Serializer =
+  Expected<std::unique_ptr<remarks::RemarkSerializer>> RemarkSerializer =
       remarks::createRemarkSerializer(*Format, RemarksFile->os());
-  if (Error E = Serializer.takeError())
+  if (Error E = RemarkSerializer.takeError())
     return make_error<RemarkSetupFormatError>(std::move(E));
 
   Context.setRemarkStreamer(llvm::make_unique<RemarkStreamer>(
-      RemarksFilename, std::move(*Serializer)));
+      RemarksFilename, std::move(*RemarkSerializer)));
 
   if (!RemarksPasses.empty())
     if (Error E = Context.getRemarkStreamer()->setFilter(RemarksPasses))
diff --git a/llvm/lib/Remarks/RemarkSerializer.cpp b/llvm/lib/Remarks/RemarkSerializer.cpp
index b1cfd098134..aa68b497ef2 100644
--- a/llvm/lib/Remarks/RemarkSerializer.cpp
+++ b/llvm/lib/Remarks/RemarkSerializer.cpp
@@ -16,21 +16,21 @@
 using namespace llvm;
 using namespace llvm::remarks;
 
-Expected<std::unique_ptr<Serializer>>
+Expected<std::unique_ptr<RemarkSerializer>>
 remarks::createRemarkSerializer(Format RemarksFormat, raw_ostream &OS) {
   switch (RemarksFormat) {
   case Format::Unknown:
     return createStringError(std::errc::invalid_argument,
                              "Unknown remark serializer format.");
   case Format::YAML:
-    return llvm::make_unique<YAMLSerializer>(OS);
+    return llvm::make_unique<YAMLRemarkSerializer>(OS);
   case Format::YAMLStrTab:
-    return llvm::make_unique<YAMLStrTabSerializer>(OS);
+    return llvm::make_unique<YAMLStrTabRemarkSerializer>(OS);
   }
   llvm_unreachable("Unknown remarks::Format enum");
 }
 
-Expected<std::unique_ptr<Serializer>>
+Expected<std::unique_ptr<RemarkSerializer>>
 remarks::createRemarkSerializer(Format RemarksFormat, raw_ostream &OS,
                                 remarks::StringTable StrTab) {
   switch (RemarksFormat) {
@@ -42,7 +42,7 @@ remarks::createRemarkSerializer(Format RemarksFormat, raw_ostream &OS,
                              "Unable to use a string table with the yaml "
                              "format. Use 'yaml-strtab' instead.");
   case Format::YAMLStrTab:
-    return llvm::make_unique<YAMLStrTabSerializer>(OS, std::move(StrTab));
+    return llvm::make_unique<YAMLStrTabRemarkSerializer>(OS, std::move(StrTab));
   }
   llvm_unreachable("Unknown remarks::Format enum");
 }
diff --git a/llvm/lib/Remarks/YAMLRemarkSerializer.cpp b/llvm/lib/Remarks/YAMLRemarkSerializer.cpp
index 1297fbc9843..c8a4ffe01d9 100644
--- a/llvm/lib/Remarks/YAMLRemarkSerializer.cpp
+++ b/llvm/lib/Remarks/YAMLRemarkSerializer.cpp
@@ -57,7 +57,7 @@ template <> struct MappingTraits<remarks::Remark *> {
       llvm_unreachable("Unknown remark type");
 
     if (Optional<StringTable> &StrTab =
-            reinterpret_cast<YAMLSerializer *>(io.getContext())->StrTab) {
+            reinterpret_cast<YAMLRemarkSerializer *>(io.getContext())->StrTab) {
       unsigned PassID = StrTab->add(Remark->PassName).first;
       unsigned NameID = StrTab->add(Remark->RemarkName).first;
       unsigned FunctionID = StrTab->add(Remark->FunctionName).first;
@@ -79,7 +79,7 @@ template <> struct MappingTraits<RemarkLocation> {
     unsigned Col = RL.SourceColumn;
 
     if (Optional<StringTable> &StrTab =
-            reinterpret_cast<YAMLSerializer *>(io.getContext())->StrTab) {
+            reinterpret_cast<YAMLRemarkSerializer *>(io.getContext())->StrTab) {
       unsigned FileID = StrTab->add(File).first;
       io.mapRequired("File", FileID);
     } else {
@@ -131,7 +131,7 @@ template <> struct MappingTraits<Argument> {
     assert(io.outputting() && "input not yet implemented");
 
     if (Optional<StringTable> &StrTab =
-            reinterpret_cast<YAMLSerializer *>(io.getContext())->StrTab) {
+            reinterpret_cast<YAMLRemarkSerializer *>(io.getContext())->StrTab) {
       auto ValueID = StrTab->add(A.Val).first;
       io.mapRequired(A.Key.data(), ValueID);
     } else if (StringRef(A.Val).count('\n') > 1) {
@@ -149,10 +149,10 @@ template <> struct MappingTraits<Argument> {
 
 LLVM_YAML_IS_SEQUENCE_VECTOR(Argument)
 
-YAMLSerializer::YAMLSerializer(raw_ostream &OS)
-    : Serializer(OS), YAMLOutput(OS, reinterpret_cast<void *>(this)) {}
+YAMLRemarkSerializer::YAMLRemarkSerializer(raw_ostream &OS)
+    : RemarkSerializer(OS), YAMLOutput(OS, reinterpret_cast<void *>(this)) {}
 
-void YAMLSerializer::emit(const Remark &Remark) {
+void YAMLRemarkSerializer::emit(const Remark &Remark) {
   // Again, YAMLTraits expect a non-const object for inputting, but we're not
   // using that here.
   auto R = const_cast<remarks::Remark *>(&Remark);