Revert rL366946 : [Remarks] Add support for serializing metadata for every remark streamer

This allows every serializer format to implement metaSerializer() and
return the corresponding meta serializer.
........
Fix windows build bots
http://lab.llvm.org:8011/builders/llvm-clang-x86_64-win-fast
http://lab.llvm.org:8011/builders/llvm-clang-lld-x86_64-scei-ps4-windows10pro-fast
http://lab.llvm.org:8011/builders/llvm-clang-x86_64-expensive-checks-win

llvm-svn: 367004

1 files changed, 21 insertions, 39 deletions

diff --git a/llvm/unittests/Remarks/YAMLRemarksSerializerTest.cpp b/llvm/unittests/Remarks/YAMLRemarksSerializerTest.cpp
index 2d080483d48..12c754ee2c7 100644
--- a/llvm/unittests/Remarks/YAMLRemarksSerializerTest.cpp
+++ b/llvm/unittests/Remarks/YAMLRemarksSerializerTest.cpp
@@ -14,10 +14,11 @@
 using namespace llvm;
 
 static void check(const remarks::Remark &R, StringRef ExpectedR,
-                  StringRef ExpectedMeta, bool UseStrTab = false,
+                  Optional<StringRef> ExpectedStrTab = None,
                   Optional<remarks::StringTable> StrTab = None) {
   std::string Buf;
   raw_string_ostream OS(Buf);
+  bool UseStrTab = ExpectedStrTab.hasValue();
   Expected<std::unique_ptr<remarks::RemarkSerializer>> MaybeS = [&] {
     if (UseStrTab) {
       if (StrTab)
@@ -33,12 +34,12 @@ static void check(const remarks::Remark &R, StringRef ExpectedR,
 
   S->emit(R);
   EXPECT_EQ(OS.str(), ExpectedR);
-
-  Buf.clear();
-  std::unique_ptr<remarks::MetaSerializer> MS =
-      S->metaSerializer(OS, StringRef("/externalfile"));
-  MS->emit();
-  EXPECT_EQ(OS.str(), ExpectedMeta);
+  if (ExpectedStrTab) {
+    Buf.clear();
+    EXPECT_TRUE(S->StrTab);
+    S->StrTab->serialize(OS);
+    EXPECT_EQ(OS.str(), *ExpectedStrTab);
+  }
 }
 
 TEST(YAMLRemarks, SerializerRemark) {
@@ -56,23 +57,17 @@ TEST(YAMLRemarks, SerializerRemark) {
   R.Args.back().Key = "keydebug";
   R.Args.back().Val = "valuedebug";
   R.Args.back().Loc = remarks::RemarkLocation{"argpath", 6, 7};
-  check(R,
-        "--- !Missed\n"
-        "Pass:            pass\n"
-        "Name:            name\n"
-        "DebugLoc:        { File: path, Line: 3, Column: 4 }\n"
-        "Function:        func\n"
-        "Hotness:         5\n"
-        "Args:\n"
-        "  - key:             value\n"
-        "  - keydebug:        valuedebug\n"
-        "    DebugLoc:        { File: argpath, Line: 6, Column: 7 }\n"
-        "...\n",
-        StringRef("REMARKS\0"
-                  "\0\0\0\0\0\0\0\0"
-                  "\0\0\0\0\0\0\0\0"
-                  "/externalfile\0",
-                  38));
+  check(R, "--- !Missed\n"
+           "Pass:            pass\n"
+           "Name:            name\n"
+           "DebugLoc:        { File: path, Line: 3, Column: 4 }\n"
+           "Function:        func\n"
+           "Hotness:         5\n"
+           "Args:\n"
+           "  - key:             value\n"
+           "  - keydebug:        valuedebug\n"
+           "    DebugLoc:        { File: argpath, Line: 6, Column: 7 }\n"
+           "...\n");
 }
 
 TEST(YAMLRemarks, SerializerRemarkStrTab) {
@@ -102,13 +97,7 @@ TEST(YAMLRemarks, SerializerRemarkStrTab) {
         "  - keydebug:        5\n"
         "    DebugLoc:        { File: 6, Line: 6, Column: 7 }\n"
         "...\n",
-        StringRef("REMARKS\0"
-                  "\0\0\0\0\0\0\0\0"
-                  "\x2d\0\0\0\0\0\0\0"
-                  "pass\0name\0func\0path\0value\0valuedebug\0argpath\0"
-                  "/externalfile\0",
-                  83),
-        /*UseStrTab=*/true);
+        StringRef("pass\0name\0func\0path\0value\0valuedebug\0argpath\0", 45));
 }
 
 TEST(YAMLRemarks, SerializerRemarkParsedStrTab) {
@@ -139,12 +128,5 @@ TEST(YAMLRemarks, SerializerRemarkParsedStrTab) {
         "  - keydebug:        5\n"
         "    DebugLoc:        { File: 6, Line: 6, Column: 7 }\n"
         "...\n",
-        StringRef("REMARKS\0"
-                  "\0\0\0\0\0\0\0\0"
-                  "\x2d\0\0\0\0\0\0\0"
-                  "pass\0name\0func\0path\0value\0valuedebug\0argpath\0"
-                  "/externalfile\0",
-                  83),
-        /*UseStrTab=*/true,
-        remarks::StringTable(remarks::ParsedStringTable(StrTab)));
+        StrTab, remarks::StringTable(remarks::ParsedStringTable(StrTab)));
 }