diff --git a/lib/CodeGen/StackProtector.cpp b/lib/CodeGen/StackProtector.cpp
index 1753eda56d8..e3fdb96f620 100644
--- a/lib/CodeGen/StackProtector.cpp
+++ b/lib/CodeGen/StackProtector.cpp
@@ -234,13 +234,12 @@ bool StackProtector::RequiresStackProtector() {
   // using the analysis pass to avoid building DominatorTree and LoopInfo which
   // are not available this late in the IR pipeline.
   OptimizationRemarkEmitter ORE(F);
-  auto ReasonStub =
-      Twine("Stack protection applied to function " + F->getName() + " due to ")
-          .str();
 
   if (F->hasFnAttribute(Attribute::StackProtectReq)) {
     ORE.emit(OptimizationRemark(DEBUG_TYPE, "StackProtectorRequested", F)
-             << ReasonStub << "a function attribute or command-line switch");
+             << "Stack protection applied to function "
+             << ore::NV("Function", F)
+             << " due to a function attribute or command-line switch");
     NeedsProtector = true;
     Strong = true; // Use the same heuristic as strong to determine SSPLayout
   } else if (F->hasFnAttribute(Attribute::StackProtectStrong))
@@ -256,8 +255,10 @@ bool StackProtector::RequiresStackProtector() {
         if (AI->isArrayAllocation()) {
           OptimizationRemark Remark(DEBUG_TYPE, "StackProtectorAllocaOrArray",
                                     &I);
-          Remark << ReasonStub
-                 << "a call to alloca or use of a variable length array";
+          Remark
+              << "Stack protection applied to function "
+              << ore::NV("Function", F)
+              << " due to a call to alloca or use of a variable length array";
           if (const auto *CI = dyn_cast<ConstantInt>(AI->getArraySize())) {
             if (CI->getLimitedValue(SSPBufferSize) >= SSPBufferSize) {
               // A call to alloca with size >= SSPBufferSize requires
@@ -285,8 +286,10 @@ bool StackProtector::RequiresStackProtector() {
           Layout.insert(std::make_pair(AI, IsLarge ? SSPLK_LargeArray
                                                    : SSPLK_SmallArray));
           ORE.emit(OptimizationRemark(DEBUG_TYPE, "StackProtectorBuffer", &I)
-                   << ReasonStub
-                   << "a stack allocated buffer or struct containing a buffer");
+                   << "Stack protection applied to function "
+                   << ore::NV("Function", F)
+                   << " due to a stack allocated buffer or struct containing a "
+                      "buffer");
           NeedsProtector = true;
           continue;
         }
@@ -296,7 +299,9 @@ bool StackProtector::RequiresStackProtector() {
           Layout.insert(std::make_pair(AI, SSPLK_AddrOf));
           ORE.emit(
               OptimizationRemark(DEBUG_TYPE, "StackProtectorAddressTaken", &I)
-              << ReasonStub << "the address of a local variable being taken");
+              << "Stack protection applied to function "
+              << ore::NV("Function", F)
+              << " due to the address of a local variable being taken");
           NeedsProtector = true;
         }
       }
diff --git a/test/CodeGen/X86/stack-protector-remarks.ll b/test/CodeGen/X86/stack-protector-remarks.ll
index f5e34c43462..3792bef2742 100644
--- a/test/CodeGen/X86/stack-protector-remarks.ll
+++ b/test/CodeGen/X86/stack-protector-remarks.ll
@@ -30,6 +30,18 @@
 ; RUN: llc %s -mtriple=x86_64-unknown-unknown -o /dev/null 2>&1 | FileCheck %s -check-prefix=NOREMARK -allow-empty
 ; NOREMARK-NOT: ssp
 
+; RUN: llc %s -mtriple=x86_64-unknown-unknown -o /dev/null -pass-remarks-output=%t.yaml
+; RUN: cat %t.yaml | FileCheck %s -check-prefix=YAML
+; YAML:      --- !Passed
+; YAML-NEXT: Pass:            stack-protector
+; YAML-NEXT: Name:            StackProtectorRequested
+; YAML-NEXT: Function:        attribute_ssp
+; YAML-NEXT: Args:
+; YAML-NEXT:   - String:          'Stack protection applied to function '
+; YAML-NEXT:   - Function:        attribute_ssp
+; YAML-NEXT:   - String:          ' due to a function attribute or command-line switch'
+; YAML-NEXT: ...
+
 define void @nossp() ssp {
   ret void
 }