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

Compute the size of an archive member in the constructor. 

It is always computed the same way (by parsing the header). Doing it in the
constructor simplifies the callers a bit.

llvm-svn: 185905
This commit is contained in:
Rafael Espindola 2013-07-09 05:26:25 +00:00
parent e22176c648
commit 0f3de64ddf
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
llvm/include/llvm/Object/Archive.h
View File

@ -51,7 +51,7 @@ public:
uint16_t StartOfFile;
public:
Child(const Archive *p, StringRef d);
Child(const Archive *Parent, const char *Start);
bool operator ==(const Child &other) const {
return (Parent == other.Parent) && (Data.begin() == other.Data.begin());
@ -81,7 +81,7 @@ public:
class child_iterator {
Child child;
public:
child_iterator() : child(Child(0, StringRef())) {}
child_iterator() : child(Child(0, 0)) {}
child_iterator(const Child &c) : child(c) {}
const Child* operator->() const {
return &child;

27
llvm/lib/Object/Archive.cpp
View File

@ -61,13 +61,18 @@ uint64_t ArchiveMemberHeader::getSize() const {
return ret;
}
Archive::Child::Child(const Archive *p, StringRef d) : Parent(p), Data(d) {
if (!p || d.empty())
Archive::Child::Child(const Archive *Parent, const char *Start)
: Parent(Parent) {
if (!Start)
return;
const ArchiveMemberHeader *Header = ToHeader(Start);
Data = StringRef(Start, sizeof(ArchiveMemberHeader) + Header->getSize());
// Setup StartOfFile and PaddingBytes.
StartOfFile = sizeof(ArchiveMemberHeader);
// Don't include attached name.
StringRef Name = ToHeader(Data.data())->getName();
StringRef Name = Header->getName();
if (Name.startswith("#1/")) {
uint64_t NameSize;
if (Name.substr(3).rtrim(" ").getAsInteger(10, NameSize))
@ -86,11 +91,9 @@ Archive::Child Archive::Child::getNext() const {
// Check to see if this is past the end of the archive.
if (NextLoc >= Parent->Data->getBufferEnd())
return Child(Parent, StringRef(0, 0));
return Child(Parent, NULL);
size_t NextSize = sizeof(ArchiveMemberHeader) + ToHeader(NextLoc)->getSize();
return Child(Parent, StringRef(NextLoc, NextSize));
return Child(Parent, NextLoc);
}
error_code Archive::Child::getName(StringRef &Result) const {
@ -265,9 +268,7 @@ Archive::Archive(MemoryBuffer *source, error_code &ec)
Archive::child_iterator Archive::begin_children(bool skip_internal) const {
const char *Loc = Data->getBufferStart() + strlen(Magic);
size_t Size = sizeof(ArchiveMemberHeader) +
ToHeader(Loc)->getSize();
Child c(this, StringRef(Loc, Size));
Child c(this, Loc);
// Skip internals at the beginning of an archive.
if (skip_internal && isInternalMember(*ToHeader(Loc)))
return c.getNext();
@ -275,7 +276,7 @@ Archive::child_iterator Archive::begin_children(bool skip_internal) const {
}
Archive::child_iterator Archive::end_children() const {
return Child(this, StringRef(0, 0));
return Child(this, NULL);
}
error_code Archive::Symbol::getName(StringRef &Result) const {
@ -323,9 +324,7 @@ error_code Archive::Symbol::getMember(child_iterator &Result) const {
}
const char *Loc = Parent->getData().begin() + Offset;
size_t Size = sizeof(ArchiveMemberHeader) +
ToHeader(Loc)->getSize();
Result = Child(Parent, StringRef(Loc, Size));
Result = Child(Parent, Loc);
return object_error::success;
}