diff --git a/llvm/lib/CodeGen/AsmPrinter/PseudoProbePrinter.cpp b/llvm/lib/CodeGen/AsmPrinter/PseudoProbePrinter.cpp
--- a/llvm/lib/CodeGen/AsmPrinter/PseudoProbePrinter.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/PseudoProbePrinter.cpp
@@ -45,7 +45,7 @@
   uint64_t Discriminator = 0;
   // For now only block probes have FS discriminators. See
   // MIRFSDiscriminator.cpp for more details.
-  if (DebugLoc &&
+  if (EnableFSDiscriminator && DebugLoc &&
       !DILocation::isPseudoProbeDiscriminator(DebugLoc->getDiscriminator()))
     Discriminator = DebugLoc->getDiscriminator();
   SmallVector<InlineSite, 8> InlineStack(llvm::reverse(ReversedInlineStack));