RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-24 19:52:54 +01:00
Code Issues Projects Releases Wiki Activity

Don't allocate the SmallVector of Registers. It gets messy figuring out who

Browse Source 
should delete what when the object gets copied around. It's also making valgrind
upset.

llvm-svn: 119747
This commit is contained in:
Bill Wendling 2010-11-18 21:50:54 +00:00
parent 2f9d8861ac
commit 510e600542
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/Target/ARM/AsmParser/ARMAsmParser.cpp
View File

@ -113,6 +113,7 @@ class ARMOperand : public MCParsedAsmOperand {
} Kind;
SMLoc StartLoc, EndLoc;
SmallVector<unsigned, 8> Registers;
union {
struct {
@ -129,10 +130,6 @@ class ARMOperand : public MCParsedAsmOperand {
bool Writeback;
} Reg;
struct {
SmallVector<unsigned, 32> *Registers;
} RegList;
struct {
const MCExpr *Val;
} Imm;
@ -172,7 +169,7 @@ public:
case RegisterList:
case DPRRegisterList:
case SPRRegisterList:
RegList = o.RegList;
Registers = o.Registers;
break;
case Immediate:
Imm = o.Imm;
@ -182,10 +179,6 @@ public:
break;
}
}
~ARMOperand() {
if (isRegList())
delete RegList.Registers;
}
/// getStartLoc - Get the location of the first token of this operand.
SMLoc getStartLoc() const { return StartLoc; }
@ -210,7 +203,7 @@ public:
const SmallVectorImpl<unsigned> &getRegList() const {
assert((Kind == RegisterList || Kind == DPRRegisterList ||
Kind == SPRRegisterList) && "Invalid access!");
return *RegList.Registers;
return Registers;
}
const MCExpr *getImm() const {
@ -350,11 +343,10 @@ public:
Kind = SPRRegisterList;
ARMOperand *Op = new ARMOperand(Kind);
Op->RegList.Registers = new SmallVector<unsigned, 32>();
for (SmallVectorImpl<std::pair<unsigned, SMLoc> >::const_iterator
I = Regs.begin(), E = Regs.end(); I != E; ++I)
Op->RegList.Registers->push_back(I->first);
std::sort(Op->RegList.Registers->begin(), Op->RegList.Registers->end());
Op->Registers.push_back(I->first);
std::sort(Op->Registers.begin(), Op->Registers.end());
Op->StartLoc = StartLoc;
Op->EndLoc = EndLoc;
return Op;