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

Fix the leak from r121401 of the Operands erased in the list but not deleted.

Browse Source 
llvm-svn: 121450
This commit is contained in:
Kevin Enderby 2010-12-10 01:41:56 +00:00
parent 2bb1326bb6
commit a2efb1ad4e
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -962,8 +962,11 @@ MatchAndEmitInstruction(SMLoc IDLoc,
MatchResult2 = MatchInstructionImpl(Operands, Inst, ErrorInfo); MatchResult2 = MatchInstructionImpl(Operands, Inst, ErrorInfo);
if (MatchResult2 == Match_Success) if (MatchResult2 == Match_Success)
MatchResult = Match_Success; MatchResult = Match_Success;
else else {
ARMOperand *CCOut = ((ARMOperand*)Operands[1]);
Operands.erase(Operands.begin() + 1); Operands.erase(Operands.begin() + 1);
delete CCOut;
}
} }
// If we get a Match_MnemonicFail it might be some arithmetic instruction // If we get a Match_MnemonicFail it might be some arithmetic instruction
// that updates the condition codes if it ends in 's'. So see if the // that updates the condition codes if it ends in 's'. So see if the
@ -976,8 +979,10 @@ MatchAndEmitInstruction(SMLoc IDLoc,
// removed the 's' from the mnemonic for matching. // removed the 's' from the mnemonic for matching.
StringRef MnemonicNoS = Mnemonic.slice(0, Mnemonic.size() - 1); StringRef MnemonicNoS = Mnemonic.slice(0, Mnemonic.size() - 1);
SMLoc NameLoc = ((ARMOperand*)Operands[0])->getStartLoc(); SMLoc NameLoc = ((ARMOperand*)Operands[0])->getStartLoc();
Operands.erase(Operands.begin()); ARMOperand *OldMnemonic = ((ARMOperand*)Operands[0]);
Operands.insert(Operands.begin(), Operands.erase(Operands.begin());
delete OldMnemonic;
Operands.insert(Operands.begin(),
ARMOperand::CreateToken(MnemonicNoS, NameLoc)); ARMOperand::CreateToken(MnemonicNoS, NameLoc));
Operands.insert(Operands.begin() + 1, Operands.insert(Operands.begin() + 1,
ARMOperand::CreateCCOut(ARM::CPSR, NameLoc)); ARMOperand::CreateCCOut(ARM::CPSR, NameLoc));
@ -985,10 +990,14 @@ MatchAndEmitInstruction(SMLoc IDLoc,
if (MatchResult2 == Match_Success) if (MatchResult2 == Match_Success)
MatchResult = Match_Success; MatchResult = Match_Success;
else { else {
Operands.erase(Operands.begin()); ARMOperand *OldMnemonic = ((ARMOperand*)Operands[0]);
Operands.insert(Operands.begin(), Operands.erase(Operands.begin());
delete OldMnemonic;
Operands.insert(Operands.begin(),
ARMOperand::CreateToken(Mnemonic, NameLoc)); ARMOperand::CreateToken(Mnemonic, NameLoc));
Operands.erase(Operands.begin() + 1); ARMOperand *CCOut = ((ARMOperand*)Operands[1]);
Operands.erase(Operands.begin() + 1);
delete CCOut;
} }
} }
} }