Index: llvm/include/llvm/IR/DebugInfoMetadata.h
===================================================================
--- llvm/include/llvm/IR/DebugInfoMetadata.h
+++ llvm/include/llvm/IR/DebugInfoMetadata.h
@@ -1701,7 +1701,7 @@
   inline unsigned getCopyIdentifier() const;
 
   /// Returns the base discriminator stored in the discriminator.
-  inline unsigned getBaseDiscriminator() const;
+  inline unsigned getBaseDiscriminator(bool IsFSDiscriminator = false) const;
 
   /// Returns a new DILocation with duplication factor \p DF * current
   /// duplication factor encoded in the discriminator. The current duplication
@@ -1744,8 +1744,10 @@
   static unsigned getBaseDiscriminatorBits() { return getBaseFSBitEnd(); }
 
   /// Returns the base discriminator for a given encoded discriminator \p D.
-  static unsigned getBaseDiscriminatorFromDiscriminator(unsigned D) {
-    if (EnableFSDiscriminator)
+  static unsigned
+  getBaseDiscriminatorFromDiscriminator(unsigned D,
+                                        bool IsFSDiscriminator = false) {
+    if (IsFSDiscriminator)
       return getMaskedDiscriminator(D, getBaseDiscriminatorBits());
     return getUnsignedFromPrefixEncoding(D);
   }
@@ -2197,8 +2199,9 @@
                          getInlinedAt());
 }
 
-unsigned DILocation::getBaseDiscriminator() const {
-  return getBaseDiscriminatorFromDiscriminator(getDiscriminator());
+unsigned DILocation::getBaseDiscriminator(bool IsFSDiscriminator) const {
+  return getBaseDiscriminatorFromDiscriminator(getDiscriminator(),
+                                               IsFSDiscriminator);
 }
 
 unsigned DILocation::getDuplicationFactor() const {
@@ -2213,7 +2216,7 @@
   unsigned BD, DF, CI;
 
   if (EnableFSDiscriminator) {
-    BD = getBaseDiscriminator();
+    BD = getBaseDiscriminator(/* IsFSDiscriminator */ true);
     if (D == BD)
       return this;
     return cloneWithDiscriminator(D);
@@ -2234,7 +2237,7 @@
   if (DF <= 1)
     return this;
 
-  unsigned BD = getBaseDiscriminator();
+  unsigned BD = getBaseDiscriminator(/* IsFSDiscriminator */ false);
   unsigned CI = getCopyIdentifier();
   if (Optional<unsigned> D = encodeDiscriminator(BD, DF, CI))
     return cloneWithDiscriminator(*D);
Index: llvm/include/llvm/Transforms/Utils/SampleProfileLoaderBaseImpl.h
===================================================================
--- llvm/include/llvm/Transforms/Utils/SampleProfileLoaderBaseImpl.h
+++ llvm/include/llvm/Transforms/Utils/SampleProfileLoaderBaseImpl.h
@@ -279,7 +279,11 @@
 
   const DILocation *DIL = DLoc;
   uint32_t LineOffset = FunctionSamples::getOffset(DIL);
-  uint32_t Discriminator = DIL->getBaseDiscriminator();
+  uint32_t Discriminator;
+  if (EnableFSDiscriminator)
+    Discriminator = DIL->getDiscriminator();
+  else
+    Discriminator = DIL->getBaseDiscriminator(/* IsFSDiscriminator */ false);
   ErrorOr<uint64_t> R = FS->findSamplesAt(LineOffset, Discriminator);
   if (R) {
     bool FirstMark =
@@ -298,11 +302,9 @@
         return Remark;
       });
     }
-    LLVM_DEBUG(dbgs() << "    " << DLoc.getLine() << "."
-                      << DIL->getBaseDiscriminator() << ":" << Inst
-                      << " (line offset: " << LineOffset << "."
-                      << DIL->getBaseDiscriminator() << " - weight: " << R.get()
-                      << ")\n");
+    LLVM_DEBUG(dbgs() << "    " << DLoc.getLine() << "." << Discriminator << ":"
+                      << Inst << " (line offset: " << LineOffset << "."
+                      << Discriminator << " - weight: " << R.get() << ")\n");
   }
   return R;
 }
Index: llvm/lib/ProfileData/SampleProf.cpp
===================================================================
--- llvm/lib/ProfileData/SampleProf.cpp
+++ llvm/lib/ProfileData/SampleProf.cpp
@@ -213,8 +213,9 @@
                             DIL->getDiscriminator()),
                         0);
   else
-    return LineLocation(FunctionSamples::getOffset(DIL),
-                        DIL->getBaseDiscriminator());
+    return LineLocation(
+        FunctionSamples::getOffset(DIL),
+        DIL->getBaseDiscriminator(/* IsFSDiscriminator */ ProfileIsFS));
 }
 
 const FunctionSamples *FunctionSamples::findFunctionSamples(
@@ -228,7 +229,7 @@
     if (ProfileIsFS)
       Discriminator = DIL->getDiscriminator();
     else
-      Discriminator = DIL->getBaseDiscriminator();
+      Discriminator = DIL->getBaseDiscriminator(/* IsFSDiscriminator */ false);
 
     S.push_back(
         std::make_pair(LineLocation(getOffset(DIL), Discriminator),
Index: llvm/tools/llvm-profgen/ProfiledBinary.cpp
===================================================================
--- llvm/tools/llvm-profgen/ProfiledBinary.cpp
+++ llvm/tools/llvm-profgen/ProfiledBinary.cpp
@@ -440,7 +440,8 @@
       FunctionName = FunctionSamples::getCanonicalFnName(FunctionName);
     LineLocation Line(CallerFrame.Line - CallerFrame.StartLine,
                       DILocation::getBaseDiscriminatorFromDiscriminator(
-                          CallerFrame.Discriminator));
+                          CallerFrame.Discriminator,
+                          /* IsFSDiscriminator */ false));
     FrameLocation Callsite(FunctionName.str(), Line);
     CallStack.push_back(Callsite);
   }