[dsymutil] Sort entries in YamlDMO to stabilize print order

MaskRay · MaskRay · commit 8da7abb1f847 · 2023-07-19T21:02:01.000-07:00
Similar to the llvm::sort call in DebugMapObject::print.
diff --git a/llvm/test/tools/dsymutil/absolute_symbol.test b/llvm/test/tools/dsymutil/absolute_symbol.test
@@ -15,3 +15,4 @@ might conflict with other real symbols in the same file.
 
 CHECK: objc_class_name_Foo
 CHECK-NOT: objAddr
+CHECK: }
diff --git a/llvm/tools/dsymutil/DebugMap.cpp b/llvm/tools/dsymutil/DebugMap.cpp
@@ -229,6 +229,7 @@ MappingTraits<dsymutil::DebugMapObject>::YamlDMO::YamlDMO(
   for (auto &Entry : Obj.Symbols)
     Entries.push_back(
         std::make_pair(std::string(Entry.getKey()), Entry.getValue()));
+  llvm::sort(Entries, llvm::less_first());
 }
 
 dsymutil::DebugMapObject

Original file line number	Diff line number	Diff line change
`@@ -15,3 +15,4 @@ might conflict with other real symbols in the same file.`
`15`	`15`
`16`	`16`	`CHECK: objc_class_name_Foo`
`17`	`17`	`CHECK-NOT: objAddr`
	`18`	`+CHECK: }`
Original file line number	Diff line number	Diff line change
`@@ -229,6 +229,7 @@ MappingTraits<dsymutil::DebugMapObject>::YamlDMO::YamlDMO(`
`229`	`229`	`for (auto &Entry : Obj.Symbols)`
`230`	`230`	`Entries.push_back(`
`231`	`231`	`std::make_pair(std::string(Entry.getKey()), Entry.getValue()));`
	`232`	`+ llvm::sort(Entries, llvm::less_first());`
`232`	`233`	`}`
`233`	`234`
`234`	`235`	`dsymutil::DebugMapObject`