diff --git a/lib/Analysis/StackSafetyAnalysis.cpp b/lib/Analysis/StackSafetyAnalysis.cpp
index 86c6bb53865..cd74a025045 100644
--- a/lib/Analysis/StackSafetyAnalysis.cpp
+++ b/lib/Analysis/StackSafetyAnalysis.cpp
@@ -812,11 +812,11 @@ StackSafetyInfo::getParamAccesses() const {
       }
       Param.Calls.emplace_back(C.first.ParamNo, C.first.Callee->getGUID(),
                                C.second);
+      llvm::sort(Param.Calls, [](const FunctionSummary::ParamAccess::Call &L,
+                                 const FunctionSummary::ParamAccess::Call &R) {
+        return std::tie(L.ParamNo, L.Callee) < std::tie(R.ParamNo, R.Callee);
+      });
     }
-    sort(Param.Calls, [](const FunctionSummary::ParamAccess::Call &L,
-                         const FunctionSummary::ParamAccess::Call &R) {
-      return std::tie(L.ParamNo, L.Callee) < std::tie(R.ParamNo, R.Callee);
-    });
   }
   return ParamAccesses;
 }
diff --git a/test/Bitcode/thinlto-function-summary-paramaccess.ll b/test/Bitcode/thinlto-function-summary-paramaccess.ll
index 6351133ce3d..1757173ec52 100644
--- a/test/Bitcode/thinlto-function-summary-paramaccess.ll
+++ b/test/Bitcode/thinlto-function-summary-paramaccess.ll
@@ -230,7 +230,7 @@ entry:
 }
 
 ; SSI-LABEL: for function 'CallMany2'
-; SSI: p[]: empty-set, @Callee(arg0, [-715,125)), @Callee2(arg1, [-33,-32))
+; SSI: p[]: empty-set, @Callee(arg0, [-715,125))
 ; BC-NEXT: <PARAM_ACCESS op0=0 op1=0 op2=0 op3=2 op4=0 op5=[[CALLEE]] op6=1431 op7=250 op8=1 op9=[[CALLEE2:-?[0-9]+]] op10=67 op11=65/>
 ; BC-NEXT: <PERMODULE
 ; DIS-DAG: = gv: (name: "CallMany2", summaries: {{.*}} calls: ((callee: ^{{.*}}), (callee: ^{{.*}})), params: ((param: 0, offset: [0, -1], calls: ((callee: ^{{.*}}, param: 0, offset: [-715, 124]), (callee: ^{{.*}}, param: 1, offset: [-33, -33]))))))) ; guid = 16654048340802466690