resolve feedback

Author: mingmingl-llvm

llvm/include/llvm/ProfileData/DataAccessProf.h

@@ -52,7 +52,11 @@ struct DataAccessProfRecord {
 
   // Represents a data symbol. The semantic comes in two forms: a symbol index
   // for symbol name if `IsStringLiteral` is false, or the hash of a string
-  // content if `IsStringLiteral` is true. Required.
+  // content if `IsStringLiteral` is true. For most of the symbolizable static
+  // data, the mangled symbol names remain stable relative to the source code
+  // and therefore used to identify symbols across binary releases. String
+  // literals have unstable name patterns like `.str.N[.llvm.hash]`, so we use
+  // the content hash instead. This is a required field.
   uint64_t SymbolID;
 
   // The access count of symbol. Required.

llvm/lib/ProfileData/DataAccessProf.cpp

@@ -35,9 +35,15 @@ const DataAccessProfRecord *
 DataAccessProfData::getProfileRecord(const SymbolHandle SymbolID) const {
   auto Key = SymbolID;
   if (std::holds_alternative<StringRef>(SymbolID)) {
-    StringRef Name = std::get<StringRef>(SymbolID);
-    assert(!Name.empty() && "Empty symbol name");
-    Key = InstrProfSymtab::getCanonicalName(Name);
+    auto NameOrErr = getCanonicalName(std::get<StringRef>(SymbolID));
+    // If name canonicalization fails, suppress the error inside.
+    if (!NameOrErr) {
+      assert(
+          std::get<StringRef>(SymbolID).empty() &&
+          "Name canonicalization only fails when stringified string is empty.");
+      return nullptr;
+    }
+    Key = *NameOrErr;
   }
 
   auto It = Records.find(Key);