Merge remote-tracking branch 'origin/master' into master-next

swift-ci · swift-ci · commit 0dc3aac08301 · 2019-03-28T11:49:28.000-07:00
diff --git a/lib/AST/GenericSignatureBuilder.cpp b/lib/AST/GenericSignatureBuilder.cpp
@@ -6014,7 +6014,7 @@ Constraint<T> GenericSignatureBuilder::checkConstraintList(
   }
 
   // Sort the constraints, so we get a deterministic ordering of diagnostics.
-  llvm::array_pod_sort(constraints.begin(), constraints.end());
+  std::sort(constraints.begin(), constraints.end());
 
   // Find a representative constraint.
   auto representativeConstraint =

Original file line number	Diff line number	Diff line change
`@@ -6014,7 +6014,7 @@ Constraint<T> GenericSignatureBuilder::checkConstraintList(`
`6014`	`6014`	`}`
`6015`	`6015`
`6016`	`6016`	`// Sort the constraints, so we get a deterministic ordering of diagnostics.`
`6017`		`- llvm::array_pod_sort(constraints.begin(), constraints.end());`
	`6017`	`+ std::sort(constraints.begin(), constraints.end());`
`6018`	`6018`
`6019`	`6019`	`// Find a representative constraint.`
`6020`	`6020`	`auto representativeConstraint =`