//
// The LLVM Compiler Infrastructure
//
-// This file was developed by Reid Spencer and is distributed under the
-// University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
#include "ArchiveInternals.h"
#include "llvm/Bitcode/ReaderWriter.h"
+#include "llvm/ADT/OwningPtr.h"
+#include "llvm/Support/MemoryBuffer.h"
#include "llvm/System/Signals.h"
#include "llvm/System/Process.h"
#include "llvm/ModuleProvider.h"
// Write an integer using variable bit rate encoding. This saves a few bytes
// per entry in the symbol table.
-inline void writeInteger(unsigned num, std::ofstream& ARFile) {
+static inline void writeInteger(unsigned num, std::ofstream& ARFile) {
while (1) {
if (num < 0x80) { // done?
ARFile << (unsigned char)num;
// Compute how many bytes are taken by a given VBR encoded value. This is needed
// to pre-compute the size of the symbol table.
-inline unsigned numVbrBytes(unsigned num) {
+static inline unsigned numVbrBytes(unsigned num) {
// Note that the following nested ifs are somewhat equivalent to a binary
// search. We split it in half by comparing against 2^14 first. This allows
// small ones and four for large ones. We expect this to access file offsets
// in the 2^10 to 2^24 range and symbol lengths in the 2^0 to 2^8 range,
// so this approach is reasonable.
- if (num < 1<<14)
+ if (num < 1<<14) {
if (num < 1<<7)
return 1;
else
return 2;
+ }
if (num < 1<<21)
return 3;
mbr->path.getMagicNumber(magic,4);
switch (sys::IdentifyFileType(magic.c_str(),4)) {
case sys::Bitcode_FileType:
- case sys::Bytecode_FileType:
- flags |= ArchiveMember::BytecodeFlag;
- break;
- case sys::CompressedBytecode_FileType:
- flags |= ArchiveMember::CompressedBytecodeFlag;
+ flags |= ArchiveMember::BitcodeFlag;
break;
default:
break;
// Get the data and its size either from the
// member's in-memory data or directly from the file.
size_t fSize = member.getSize();
- const char* data = (const char*)member.getData();
- sys::MappedFile* mFile = 0;
+ const char *data = (const char*)member.getData();
+ MemoryBuffer *mFile = 0;
if (!data) {
- mFile = new sys::MappedFile();
- if (mFile->open(member.getPath(), sys::MappedFile::READ_ACCESS, ErrMsg))
- return true;
- if (!(data = (const char*) mFile->map(ErrMsg)))
+ mFile = MemoryBuffer::getFile(member.getPath().c_str(), ErrMsg);
+ if (mFile == 0)
return true;
- fSize = mFile->size();
+ data = mFile->getBufferStart();
+ fSize = mFile->getBufferSize();
}
// Now that we have the data in memory, update the
// symbol table if its a bitcode file.
- if (CreateSymbolTable &&
- (member.isBytecode() || member.isCompressedBytecode())) {
+ if (CreateSymbolTable && member.isBitcode()) {
std::vector<std::string> symbols;
std::string FullMemberName = archPath.toString() + "(" +
member.getPath().toString()
// We don't need this module any more.
delete MP;
} else {
- if (mFile != 0) {
- mFile->close();
- delete mFile;
- }
+ delete mFile;
if (ErrMsg)
*ErrMsg = "Can't parse bitcode member: " + member.getPath().toString()
+ ": " + *ErrMsg;
ARFile << ARFILE_PAD;
// Close the mapped file if it was opened
- if (mFile != 0) {
- mFile->close();
- delete mFile;
- }
+ delete mFile;
return false;
}
{
// Make sure they haven't opened up the file, not loaded it,
// but are now trying to write it which would wipe out the file.
- if (members.empty() && mapfile->size() > 8) {
+ if (members.empty() && mapfile && mapfile->getBufferSize() > 8) {
if (ErrMsg)
*ErrMsg = "Can't write an archive not opened for writing";
return true;
// ensure compatibility with other archivers we need to put the symbol
// table first in the file. Unfortunately, this means mapping the file
// we just wrote back in and copying it to the destination file.
+ sys::Path FinalFilePath = archPath;
// Map in the archive we just wrote.
- sys::MappedFile arch;
- if (arch.open(TmpArchive, sys::MappedFile::READ_ACCESS, ErrMsg))
- return true;
- const char* base;
- if (!(base = (const char*) arch.map(ErrMsg)))
- return true;
+ {
+ OwningPtr<MemoryBuffer> arch(MemoryBuffer::getFile(TmpArchive.c_str()));
+ if (arch == 0) return true;
+ const char* base = arch->getBufferStart();
// Open another temporary file in order to avoid invalidating the
// mmapped data
- sys::Path FinalFilePath = archPath;
if (FinalFilePath.createTemporaryFileOnDisk(ErrMsg))
return true;
sys::RemoveFileOnSignal(FinalFilePath);
// Copy the temporary file contents being sure to skip the file's magic
// number.
FinalFile.write(base + sizeof(ARFILE_MAGIC)-1,
- arch.size()-sizeof(ARFILE_MAGIC)+1);
+ arch->getBufferSize()-sizeof(ARFILE_MAGIC)+1);
// Close up shop
FinalFile.close();
- arch.close();
+ } // free arch.
// Move the final file over top of TmpArchive
if (FinalFilePath.renamePathOnDisk(TmpArchive, ErrMsg))
if (TmpArchive.renamePathOnDisk(archPath, ErrMsg))
return true;
+ // Set correct read and write permissions after temporary file is moved
+ // to final destination path.
+ if (archPath.makeReadableOnDisk(ErrMsg))
+ return true;
+ if (archPath.makeWriteableOnDisk(ErrMsg))
+ return true;
+
return false;
}