From bdabc2f19ffb9e20600dad6e8a300842a7bda50e Mon Sep 17 00:00:00 2001 From: patrick Date: Fri, 6 Apr 2018 14:26:03 +0000 Subject: Import LLVM 6.0.1 release including clang, lld and lldb. "where is the kaboom?" deraadt@ --- gnu/llvm/lib/CodeGen/MachineModuleInfoImpls.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'gnu/llvm/lib/CodeGen/MachineModuleInfoImpls.cpp') diff --git a/gnu/llvm/lib/CodeGen/MachineModuleInfoImpls.cpp b/gnu/llvm/lib/CodeGen/MachineModuleInfoImpls.cpp index 22d519e5d88..07b173bc94f 100644 --- a/gnu/llvm/lib/CodeGen/MachineModuleInfoImpls.cpp +++ b/gnu/llvm/lib/CodeGen/MachineModuleInfoImpls.cpp @@ -1,4 +1,4 @@ -//===-- llvm/CodeGen/MachineModuleInfoImpls.cpp ---------------------------===// +//===- llvm/CodeGen/MachineModuleInfoImpls.cpp ----------------------------===// // // The LLVM Compiler Infrastructure // @@ -13,7 +13,9 @@ //===----------------------------------------------------------------------===// #include "llvm/CodeGen/MachineModuleInfoImpls.h" +#include "llvm/ADT/DenseMap.h" #include "llvm/MC/MCSymbol.h" + using namespace llvm; //===----------------------------------------------------------------------===// @@ -24,21 +26,17 @@ using namespace llvm; void MachineModuleInfoMachO::anchor() {} void MachineModuleInfoELF::anchor() {} -static int SortSymbolPair(const void *LHS, const void *RHS) { - typedef std::pair PairTy; - const MCSymbol *LHSS = ((const PairTy *)LHS)->first; - const MCSymbol *RHSS = ((const PairTy *)RHS)->first; - return LHSS->getName().compare(RHSS->getName()); +using PairTy = std::pair; +static int SortSymbolPair(const PairTy *LHS, const PairTy *RHS) { + return LHS->first->getName().compare(RHS->first->getName()); } MachineModuleInfoImpl::SymbolListTy MachineModuleInfoImpl::getSortedStubs( DenseMap &Map) { MachineModuleInfoImpl::SymbolListTy List(Map.begin(), Map.end()); - if (!List.empty()) - qsort(&List[0], List.size(), sizeof(List[0]), SortSymbolPair); + array_pod_sort(List.begin(), List.end(), SortSymbolPair); Map.clear(); return List; } - -- cgit v1.2.3-59-g8ed1b