commit f9380afdb8e74a3f5fa27b5f5587c9dd285026c8
author Rong Xu <xur@google.com> Tue Jan 08 22:33:29 2019 +0000
committer Rong Xu <xur@google.com> Tue Jan 08 22:33:29 2019 +0000
tree ea6a92871be233df66a0f6026011b93da61fa8de
parent f5b78899a01438901a26f8dfca81a2b886103b01

[PGO] Revert r350442 to fix commit message.

Will re-commit it using the correct commit message.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@350667 91177308-0d34-0410-b5e6-96231b3b80d8

lib/ProfileData/InstrProf.cpp

diff --git a/lib/ProfileData/InstrProf.cpp b/lib/ProfileData/InstrProf.cpp
index aaa8000..544a77e 100644
--- a/lib/ProfileData/InstrProf.cpp
+++ b/lib/ProfileData/InstrProf.cpp
@@ -252,12 +252,11 @@
 // data, its original linkage must be non-internal.
 std::string getPGOFuncName(const Function &F, bool InLTO, uint64_t Version) {
   if (!InLTO) {
-    StringRef FileName(F.getParent()->getSourceFileName());
-    uint32_t StripLevel = StaticFuncFullModulePrefix ? 0 : (uint32_t)-1;
-    if (StripLevel < StaticFuncStripDirNamePrefix)
-      StripLevel = StaticFuncStripDirNamePrefix;
-    if (StripLevel)
-      FileName = stripDirPrefix(FileName, StripLevel);
+    StringRef FileName = (StaticFuncFullModulePrefix
+                              ? F.getParent()->getName()
+                              : sys::path::filename(F.getParent()->getName()));
+    if (StaticFuncFullModulePrefix && StaticFuncStripDirNamePrefix != 0)
+      FileName = stripDirPrefix(FileName, StaticFuncStripDirNamePrefix);
     return getPGOFuncName(F.getName(), F.getLinkage(), FileName, Version);
   }