diff --git a/symbolic-debuginfo/src/base.rs b/symbolic-debuginfo/src/base.rs index 4ea8c833..01d981aa 100644 --- a/symbolic-debuginfo/src/base.rs +++ b/symbolic-debuginfo/src/base.rs @@ -413,7 +413,7 @@ impl<'d> From>> for SymbolMap<'d> { // // Inlined functions will generally not appear in this list, unless they _also_ have an // explicit function body, in which case they will have a unique address, again. - symbols.sort_unstable_by_key(Self::key); + symbols.sort_by_key(Self::key); // Compute sizes of consecutive symbols if the size has not been provided by the symbol // iterator. In the same go, drop all but the first symbols at any given address. We do diff --git a/symbolic-debuginfo/src/dwarf.rs b/symbolic-debuginfo/src/dwarf.rs index 19021c6e..3153e13c 100644 --- a/symbolic-debuginfo/src/dwarf.rs +++ b/symbolic-debuginfo/src/dwarf.rs @@ -330,7 +330,7 @@ impl<'d> DwarfLineProgram<'d> { } // Sequences are not guaranteed to be in order. - sequences.sort_unstable_by_key(|x| x.start); + sequences.sort_by_key(|x| x.start); DwarfLineProgram { header: state_machine.header().clone(), diff --git a/symbolic-debuginfo/tests/snapshots/test_objects__elf_symbols.snap b/symbolic-debuginfo/tests/snapshots/test_objects__elf_symbols.snap index b1c7255f..a7bb1d23 100644 --- a/symbolic-debuginfo/tests/snapshots/test_objects__elf_symbols.snap +++ b/symbolic-debuginfo/tests/snapshots/test_objects__elf_symbols.snap @@ -37,10 +37,10 @@ expression: SymbolsDebug(&symbols) 33a0 _ZN15google_breakpad16ExceptionHandler19UnregisterAppMemoryEPv 3400 _ZN15google_breakpad16ExceptionHandler21WriteMinidumpForChildEiiRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPFbRKNS_18MinidumpDescriptorEPvbESC_ 3660 _ZN15google_breakpad30SetFirstChanceExceptionHandlerEPFbiPvS0_E - 3670 _ZN15google_breakpad16ExceptionHandlerC2ERKNS_18MinidumpDescriptorEPFbPvEPFbS3_S4_bES4_bi + 3670 _ZN15google_breakpad16ExceptionHandlerC1ERKNS_18MinidumpDescriptorEPFbPvEPFbS3_S4_bES4_bi 3a10 _ZN15google_breakpad16ExceptionHandler13WriteMinidumpERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPFbRKNS_18MinidumpDescriptorEPvbESC_ - 3cb0 _ZNSt6vectorIPN15google_breakpad16ExceptionHandlerESaIS2_EE19_M_emplace_back_auxIJS2_EEEvDpOT_ - 3da0 _ZN15google_breakpad18MinidumpDescriptorC1ERKS0_ + 3cb0 _ZNSt6vectorIPN15google_breakpad16ExceptionHandlerESaIS2_EE19_M_emplace_back_auxIIS2_EEEvDpOT_ + 3da0 _ZN15google_breakpad18MinidumpDescriptorC2ERKS0_ 3f20 _ZN15google_breakpad18MinidumpDescriptor10UpdatePathEv 42f0 _ZN15google_breakpad18MinidumpDescriptoraSERKS0_ 43c0 _ZN6logger5writeEPKcm @@ -49,7 +49,7 @@ expression: SymbolsDebug(&symbols) 71f0 _ZN15google_breakpad11LinuxDumper8LateInitEv 7200 _ZN15google_breakpad11LinuxDumper17EnumerateMappingsEv 7ac0 _ZN15google_breakpad11LinuxDumperC2EiPKc - 8300 _ZN15google_breakpad11LinuxDumperD1Ev + 8300 _ZN15google_breakpad11LinuxDumperD2Ev 8370 _ZN15google_breakpad11LinuxDumperD0Ev 8390 _ZNK15google_breakpad11LinuxDumper20GetCrashSignalStringEv 8590 _ZNK15google_breakpad11LinuxDumper22GetMappingAbsolutePathERKNS_11MappingInfoEPc @@ -69,14 +69,14 @@ expression: SymbolsDebug(&symbols) 94a0 _ZNK15google_breakpad17LinuxPtraceDumper12IsPostMortemEv 94b0 _ZN15google_breakpad17LinuxPtraceDumper15CopyFromProcessEPviPKvm 9640 _ZN15google_breakpad17LinuxPtraceDumper13ThreadsResumeEv - 9700 _ZNK15google_breakpad17LinuxPtraceDumper13BuildProcPathEPciPKc + 9700 _ZNK15google_breakpad17LinuxPtraceDumper13BuildProcPathEPciPKc.localalias.19 97c0 _ZN15google_breakpad17LinuxPtraceDumper16EnumerateThreadsEv 9e50 _ZN15google_breakpad17LinuxPtraceDumperC1Ei 9e80 _ZN15google_breakpad17LinuxPtraceDumper15ReadRegisterSetEPNS_10ThreadInfoEi 9f70 _ZN15google_breakpad17LinuxPtraceDumper13ReadRegistersEPNS_10ThreadInfoEi a050 _ZN15google_breakpad17LinuxPtraceDumper20GetThreadInfoByIndexEmPNS_10ThreadInfoE a690 _ZN15google_breakpad17LinuxPtraceDumper14ThreadsSuspendEv - a8f0 _ZN15google_breakpad17LinuxPtraceDumperD1Ev + a8f0 _ZN15google_breakpad17LinuxPtraceDumperD2Ev a910 _ZN15google_breakpad17LinuxPtraceDumperD0Ev a930 _ZNSt6vectorIiN15google_breakpad16PageStdAllocatorIiEEE17_M_default_appendEm abc0 _ZN12_GLOBAL__N_114MinidumpWriter21WriteThreadListStreamEP14MDRawDirectory.constprop.105 @@ -92,7 +92,7 @@ expression: SymbolsDebug(&symbols) f3c0 _ZN15google_breakpad13WriteMinidumpEiliPKvmRKNSt7__cxx114listINS_12MappingEntryESaIS4_EEERKNS3_INS_9AppMemoryESaIS9_EEEbmb f400 _ZN15google_breakpad17ProcCpuInfoReader12GetNextFieldEPPKc f660 _ZNSt6vectorIcN15google_breakpad16PageStdAllocatorIcEEE6resizeEm - f8c0 _ZNSt6vectorI18MDMemoryDescriptorN15google_breakpad16PageStdAllocatorIS0_EEE19_M_emplace_back_auxIJRKS0_EEEvDpOT_ + f8c0 _ZNSt6vectorI18MDMemoryDescriptorN15google_breakpad16PageStdAllocatorIS0_EEE19_M_emplace_back_auxIIRKS0_EEEvDpOT_ fb10 _ZN15google_breakpad10TypedMDRVAI8MDStringE20CopyIndexAfterObjectEjPKvm.isra.7.part.8 fb40 _ZN15google_breakpad18MinidumpFileWriterC1Ev fb60 _ZN15google_breakpad18MinidumpFileWriter4OpenEPKc @@ -118,8 +118,8 @@ expression: SymbolsDebug(&symbols) 11220 _ZN15google_breakpad8ElfClassEPKv 11230 _ZN15google_breakpad14FindElfSectionEPKvPKcjPS1_Pm 116a0 _ZN15google_breakpad15FindElfSegmentsEPKvjPNS_15wasteful_vectorINS_10ElfSegmentEEE - 11990 _ZNSt6vectorIN15google_breakpad10ElfSegmentENS0_16PageStdAllocatorIS1_EEE19_M_emplace_back_auxIIRKS1_EEEvDpOT_ - 11be0 _ZN15google_breakpad6FileIDC1EPKc + 11990 _ZNSt6vectorIN15google_breakpad10ElfSegmentENS0_16PageStdAllocatorIS1_EEE19_M_emplace_back_auxIJRKS1_EEEvDpOT_ + 11be0 _ZN15google_breakpad6FileIDC2EPKc 11cc0 _ZN15google_breakpad6FileID29ConvertIdentifierToUUIDStringB5cxx11ERKNS_15wasteful_vectorIhEE 11e70 _ZN15google_breakpad6FileID25ConvertIdentifierToStringB5cxx11ERKNS_15wasteful_vectorIhEE 11fb0 _ZN15google_breakpad6FileID31ElfFileIdentifierFromMappedFileEPKvRNS_15wasteful_vectorIhEE @@ -142,9 +142,9 @@ expression: SymbolsDebug(&symbols) 130e0 my_strlcpy 13120 my_strlcat 13160 my_isspace - 13210 _ZN15google_breakpad16MemoryMappedFileC1Ev + 13210 _ZN15google_breakpad16MemoryMappedFileC2Ev 13220 _ZN15google_breakpad16MemoryMappedFile5UnmapEv - 13270 _ZN15google_breakpad16MemoryMappedFileD2Ev + 13270 _ZN15google_breakpad16MemoryMappedFileD1Ev 13280 _ZN15google_breakpad16MemoryMappedFile3MapEPKcm 13430 _ZN15google_breakpad16MemoryMappedFileC2EPKcm 13450 _ZN15google_breakpad12SafeReadLinkEPKcPcm diff --git a/symbolic-debuginfo/tests/snapshots/test_objects__pdb_symbols.snap b/symbolic-debuginfo/tests/snapshots/test_objects__pdb_symbols.snap index 90c732c5..03a3a070 100644 --- a/symbolic-debuginfo/tests/snapshots/test_objects__pdb_symbols.snap +++ b/symbolic-debuginfo/tests/snapshots/test_objects__pdb_symbols.snap @@ -61,13 +61,13 @@ expression: SymbolsDebug(&symbols) 3166 __onexit 31a1 _atexit 3205 ___security_init_cookie - 3250 __matherr + 3250 __get_startup_commit_mode 3253 __get_startup_argv_mode 3257 __get_startup_file_mode 325d ?__scrt_initialize_type_info@@YAXXZ 3269 __should_initialize_environment 326c __initialize_default_precision - 328d __initialize_denormal_control + 328d @_guard_check_icall_nop@4 328e ___local_stdio_scanf_options 3294 ___scrt_initialize_default_local_stdio_options 32b1 ___scrt_is_user_matherr_present