Make TOC order deterministic by using MapVector instead of DenseMap.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@167737 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Ulrich Weigand 2012-11-12 19:13:24 +00:00
parent cbf9ffc93c
commit 95d8afc5f2

View File

@ -54,12 +54,13 @@
#include "llvm/Support/ELF.h" #include "llvm/Support/ELF.h"
#include "llvm/ADT/StringExtras.h" #include "llvm/ADT/StringExtras.h"
#include "llvm/ADT/SmallString.h" #include "llvm/ADT/SmallString.h"
#include "llvm/ADT/MapVector.h"
using namespace llvm; using namespace llvm;
namespace { namespace {
class PPCAsmPrinter : public AsmPrinter { class PPCAsmPrinter : public AsmPrinter {
protected: protected:
DenseMap<MCSymbol*, MCSymbol*> TOC; MapVector<MCSymbol*, MCSymbol*> TOC;
const PPCSubtarget &Subtarget; const PPCSubtarget &Subtarget;
uint64_t TOCLabelID; uint64_t TOCLabelID;
public: public:
@ -465,8 +466,7 @@ bool PPCLinuxAsmPrinter::doFinalization(Module &M) {
SectionKind::getReadOnly()); SectionKind::getReadOnly());
OutStreamer.SwitchSection(Section); OutStreamer.SwitchSection(Section);
// FIXME: This is nondeterminstic! for (MapVector<MCSymbol*, MCSymbol*>::iterator I = TOC.begin(),
for (DenseMap<MCSymbol*, MCSymbol*>::iterator I = TOC.begin(),
E = TOC.end(); I != E; ++I) { E = TOC.end(); I != E; ++I) {
OutStreamer.EmitLabel(I->second); OutStreamer.EmitLabel(I->second);
MCSymbol *S = OutContext.GetOrCreateSymbol(I->first->getName()); MCSymbol *S = OutContext.GetOrCreateSymbol(I->first->getName());