Index: lib/Transforms/Scalar/RewriteStatepointsForGC.cpp
===================================================================
--- lib/Transforms/Scalar/RewriteStatepointsForGC.cpp
+++ lib/Transforms/Scalar/RewriteStatepointsForGC.cpp
@@ -1536,7 +1536,7 @@
 
   std::sort(NameOrdering.begin(), NameOrdering.end(),
             [](const BaseDerivedPair &L, const BaseDerivedPair &R) {
-              return L.Derived->getName() < R.Derived->getName();
+              return order_by_name(L.Derived, R.Derived);
             });
 
   for (size_t i = 0; i < BaseVec.size(); i++) {