maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[ms-inline-asm] Use an array_pod_sort, rather than a std:sort. 

llvm-svn: 175063
This commit is contained in:
Chad Rosier 2013-02-13 18:38:58 +00:00
parent 5d47a9b253
commit eb5c16893b
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
llvm/lib/MC/MCParser/AsmParser.cpp
View File

@ -13,6 +13,7 @@
#include "llvm/ADT/APFloat.h" #include "llvm/ADT/APFloat.h"
#include "llvm/ADT/SmallString.h" #include "llvm/ADT/SmallString.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/StringMap.h" #include "llvm/ADT/StringMap.h"
#include "llvm/ADT/Twine.h" #include "llvm/ADT/Twine.h"
#include "llvm/MC/MCAsmInfo.h" #include "llvm/MC/MCAsmInfo.h"
@ -4029,8 +4030,14 @@ bool AsmParser::ParseDirectiveMSAlign(SMLoc IDLoc, ParseStatementInfo &Info) {
return false; return false;
} }
bool AsmStringSort (AsmRewrite A, AsmRewrite B) { static int RewritesSort (const void *A, const void *B) {
return A.Loc.getPointer() < B.Loc.getPointer(); const AsmRewrite *AsmRewriteA = static_cast<const AsmRewrite*>(A);
const AsmRewrite *AsmRewriteB = static_cast<const AsmRewrite*>(B);
if (AsmRewriteA->Loc.getPointer() < AsmRewriteB->Loc.getPointer())
return -1;
if (AsmRewriteB->Loc.getPointer() < AsmRewriteA->Loc.getPointer())
return 1;
return 0;
} }
bool AsmParser::ParseMSInlineAsm(void *AsmLoc, std::string &AsmString, bool AsmParser::ParseMSInlineAsm(void *AsmLoc, std::string &AsmString,
@ -4157,7 +4164,7 @@ bool AsmParser::ParseMSInlineAsm(void *AsmLoc, std::string &AsmString,
AsmRewriteKind PrevKind = AOK_Imm; AsmRewriteKind PrevKind = AOK_Imm;
raw_string_ostream OS(AsmStringIR); raw_string_ostream OS(AsmStringIR);
const char *Start = SrcMgr.getMemoryBuffer(0)->getBufferStart(); const char *Start = SrcMgr.getMemoryBuffer(0)->getBufferStart();
std::sort (AsmStrRewrites.begin(), AsmStrRewrites.end(), AsmStringSort); array_pod_sort (AsmStrRewrites.begin(), AsmStrRewrites.end(), RewritesSort);
for (SmallVectorImpl<struct AsmRewrite>::iterator for (SmallVectorImpl<struct AsmRewrite>::iterator
I = AsmStrRewrites.begin(), E = AsmStrRewrites.end(); I != E; ++I) { I = AsmStrRewrites.begin(), E = AsmStrRewrites.end(); I != E; ++I) {
const char *Loc = (*I).Loc.getPointer(); const char *Loc = (*I).Loc.getPointer();