RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2024-12-20 19:20:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

llvm-ar: Clean up memory management with OwningPtr.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@186131 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Benjamin Kramer 2013-07-11 23:15:05 +00:00
parent 459d7bf8f6
commit 7172b38af7
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tools/llvm-ar/ArchiveReader.cpp
View File

@ -212,7 +212,7 @@ Archive::loadArchive(std::string* error) {
while (At < End) {
// parse the member header
const char* Save = At;
ArchiveMember* mbr = parseMemberHeader(At, End, error);
OwningPtr<ArchiveMember> mbr(parseMemberHeader(At, End, error));
if (!mbr)
return false;
@ -230,7 +230,6 @@ Archive::loadArchive(std::string* error) {
At += mbr->getSize();
if ((intptr_t(At) & 1) == 1)
At++;
delete mbr;
} else {
// This is just a regular file. If its the first one, save its offset.
// Otherwise just push it on the list and move on to the next file.
@ -238,8 +237,8 @@ Archive::loadArchive(std::string* error) {
firstFileOffset = Save - base;
foundFirstFile = true;
}
members.push_back(mbr);
At += mbr->getSize();
members.push_back(mbr.take());
if ((intptr_t(At) & 1) == 1)
At++;
}
@ -276,7 +275,7 @@ Archive::loadSymbolTable(std::string* ErrorMsg) {
// Parse the first file member header
const char* FirstFile = At;
ArchiveMember* mbr = parseMemberHeader(At, End, ErrorMsg);
OwningPtr<ArchiveMember> mbr(parseMemberHeader(At, End, ErrorMsg));
if (!mbr)
return false;
@ -285,15 +284,12 @@ Archive::loadSymbolTable(std::string* ErrorMsg) {
At += mbr->getSize();
if ((intptr_t(At) & 1) == 1)
At++;
delete mbr;
// Read the next one
FirstFile = At;
mbr = parseMemberHeader(At, End, ErrorMsg);
if (!mbr) {
delete mbr;
mbr.reset(parseMemberHeader(At, End, ErrorMsg));
if (!mbr)
return false;
}
}
if (mbr->isStringTable()) {
@ -302,21 +298,19 @@ Archive::loadSymbolTable(std::string* ErrorMsg) {
At += mbr->getSize();
if ((intptr_t(At) & 1) == 1)
At++;
delete mbr;
// Get the next one
FirstFile = At;
mbr = parseMemberHeader(At, End, ErrorMsg);
if (!mbr) {
delete mbr;
mbr.reset(parseMemberHeader(At, End, ErrorMsg));
if (!mbr)
return false;
}
}
// There's no symbol table in the file. We have to rebuild it from scratch
// because the intent of this method is to get the symbol table loaded so
// it can be searched efficiently.
// Add the member to the members list
members.push_back(mbr);
members.push_back(mbr.take());
firstFileOffset = FirstFile - base;
return true;