int FD;
failIfError(
- sys::fs::openFileForWrite(Storage.c_str(), FD, sys::fs::F_Binary, Mode),
+ sys::fs::openFileForWrite(Storage.c_str(), FD, sys::fs::F_None, Mode),
Storage.c_str());
{
static void writeSymbolTable(
raw_fd_ostream &Out, ArrayRef<NewArchiveIterator> Members,
- ArrayRef<OwningPtr<MemoryBuffer> > Buffers,
+ ArrayRef<MemoryBuffer *> Buffers,
std::vector<std::pair<unsigned, unsigned> > &MemberOffsetRefs) {
unsigned StartOffset = 0;
unsigned MemberNum = 0;
- std::vector<StringRef> SymNames;
- std::vector<object::ObjectFile *> DeleteIt;
+ std::string NameBuf;
+ raw_string_ostream NameOS(NameBuf);
+ unsigned NumSyms = 0;
+ std::vector<object::SymbolicFile *> DeleteIt;
+ LLVMContext &Context = getGlobalContext();
for (ArrayRef<NewArchiveIterator>::iterator I = Members.begin(),
E = Members.end();
I != E; ++I, ++MemberNum) {
- const OwningPtr<MemoryBuffer> &MemberBuffer = Buffers[MemberNum];
- ErrorOr<object::ObjectFile *> ObjOrErr =
- object::ObjectFile::createObjectFile(MemberBuffer.get(), false);
+ MemoryBuffer *MemberBuffer = Buffers[MemberNum];
+ ErrorOr<object::SymbolicFile *> ObjOrErr =
+ object::SymbolicFile::createSymbolicFile(
+ MemberBuffer, false, sys::fs::file_magic::unknown, &Context);
if (!ObjOrErr)
continue; // FIXME: check only for "not an object file" errors.
- object::ObjectFile *Obj = ObjOrErr.get();
+ object::SymbolicFile *Obj = ObjOrErr.get();
DeleteIt.push_back(Obj);
if (!StartOffset) {
print32BE(Out, 0);
}
- error_code Err;
- for (object::symbol_iterator I = Obj->begin_symbols(),
- E = Obj->end_symbols();
- I != E; I.increment(Err), failIfError(Err)) {
- uint32_t Symflags;
- failIfError(I->getFlags(Symflags));
+ for (object::basic_symbol_iterator I = Obj->symbol_begin(),
+ E = Obj->symbol_end();
+ I != E; ++I) {
+ uint32_t Symflags = I->getFlags();
if (Symflags & object::SymbolRef::SF_FormatSpecific)
continue;
if (!(Symflags & object::SymbolRef::SF_Global))
continue;
if (Symflags & object::SymbolRef::SF_Undefined)
continue;
- StringRef Name;
- failIfError(I->getName(Name));
- SymNames.push_back(Name);
+ failIfError(I->printName(NameOS));
+ NameOS << '\0';
+ ++NumSyms;
MemberOffsetRefs.push_back(std::make_pair(Out.tell(), MemberNum));
print32BE(Out, 0);
}
}
- for (std::vector<StringRef>::iterator I = SymNames.begin(),
- E = SymNames.end();
- I != E; ++I) {
- Out << *I;
- Out << '\0';
- }
+ Out << NameOS.str();
- for (std::vector<object::ObjectFile *>::iterator I = DeleteIt.begin(),
- E = DeleteIt.end();
+ for (std::vector<object::SymbolicFile *>::iterator I = DeleteIt.begin(),
+ E = DeleteIt.end();
I != E; ++I) {
- object::ObjectFile *O = *I;
+ object::SymbolicFile *O = *I;
delete O;
}
Out.seek(StartOffset - 12);
printWithSpacePadding(Out, Pos - StartOffset, 10);
Out.seek(StartOffset);
- print32BE(Out, SymNames.size());
+ print32BE(Out, NumSyms);
Out.seek(Pos);
}
std::vector<std::pair<unsigned, unsigned> > MemberOffsetRefs;
- std::vector<OwningPtr<MemoryBuffer> > MemberBuffers;
+ std::vector<MemoryBuffer *> MemberBuffers;
MemberBuffers.resize(NewMembers.size());
for (unsigned I = 0, N = NewMembers.size(); I < N; ++I) {
- OwningPtr<MemoryBuffer> &MemberBuffer = MemberBuffers[I];
+ OwningPtr<MemoryBuffer> MemberBuffer;
NewArchiveIterator &Member = NewMembers[I];
if (Member.isNewMember()) {
object::Archive::child_iterator OldMember = Member.getOld();
failIfError(OldMember->getMemoryBuffer(MemberBuffer));
}
+ MemberBuffers[I] = MemberBuffer.take();
}
if (Symtab) {
}
Out.seek(Pos);
- const OwningPtr<MemoryBuffer> &File = MemberBuffers[MemberNum];
+ const MemoryBuffer *File = MemberBuffers[MemberNum];
if (I->isNewMember()) {
const char *FileName = I->getNew();
const sys::fs::file_status &Status = I->getStatus();
if (Out.tell() % 2)
Out << '\n';
}
+
+ for (unsigned I = 0, N = MemberBuffers.size(); I < N; ++I) {
+ delete MemberBuffers[I];
+ }
+
Output.keep();
Out.close();
sys::fs::rename(TemporaryOutput, ArchiveName);