A few changes after 'git merge main':

- undo binary profile change on existing binary files
  {c-general.profraw, compressed.profraw}.
- run clang-format and 'git merge main'
- Delete obsolete vtable raw profile
  llvm/test/Transforms/PGOProfile/Inputs/vtable_prof.profraw

Author: mingmingl-llvm

llvm/lib/ProfileData/InstrProfWriter.cpp

@@ -608,38 +608,34 @@ Error InstrProfWriter::writeImpl(ProfOStream &OS) {
   }
 
   uint64_t VTableNamesSectionStart = 0;
-    VTableNamesSectionStart = OS.tell();
 
-    std::string CompressedVTableNames;
+  VTableNamesSectionStart = OS.tell();
 
-    std::vector<std::string> VTableNameStrs;
-    for (const auto &VTableName : VTableNames.keys()) {
+  std::vector<std::string> VTableNameStrs;
+  for (const auto &VTableName : VTableNames.keys())
       VTableNameStrs.push_back(VTableName.str());
-    }
 
-    if (!VTableNameStrs.empty()) {
-      if (Error E = collectGlobalObjectNameStrings(
-              VTableNameStrs, compression::zlib::isAvailable(),
-              CompressedVTableNames))
-        return E;
-    }
+  std::string CompressedVTableNames;
+  if (!VTableNameStrs.empty())
+    if (Error E = collectGlobalObjectNameStrings(
+      VTableNameStrs, compression::zlib::isAvailable(), CompressedVTableNames))
+      return E;
 
-    uint64_t CompressedStringLen = CompressedVTableNames.length();
+  const uint64_t CompressedStringLen = CompressedVTableNames.length();
 
-    // Record the length of compressed string.
-    OS.write(CompressedStringLen);
+  // Record the length of compressed string.
+  OS.write(CompressedStringLen);
 
-    // Write the chars in compressed strings.
-    for (auto &c : CompressedVTableNames)
-      OS.writeByte(static_cast<uint8_t>(c));
+  // Write the chars in compressed strings.
+  for (auto &c : CompressedVTableNames)
+    OS.writeByte(static_cast<uint8_t>(c));
 
-    // Pad up to a multiple of 8.
-    // InstrProfReader could read bytes according to 'CompressedStringLen'.
-    uint64_t PaddedLength = alignTo(CompressedStringLen, 8);
+  // Pad up to a multiple of 8.
+  // InstrProfReader could read bytes according to 'CompressedStringLen'.
+  const uint64_t PaddedLength = alignTo(CompressedStringLen, 8);
 
-    for (uint64_t K = CompressedStringLen; K < PaddedLength; K++) {
-      OS.writeByte(0);
-    }
+  for (uint64_t K = CompressedStringLen; K < PaddedLength; K++)
+    OS.writeByte(0);
 
   uint64_t TemporalProfTracesSectionStart = 0;
   if (static_cast<bool>(ProfileKind & InstrProfKind::TemporalProfile)) {