#include "llvm/ModuleProvider.h"
#include "llvm/Module.h"
#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/System/MappedFile.h"
#include "llvm/System/Process.h"
#include <memory>
#include <cstring>
// This default constructor is only use by the ilist when it creates its
// sentry node. We give it specific static values to make it stand out a bit.
ArchiveMember::ArchiveMember()
- : next(0), prev(0), parent(0), path("--invalid--"), flags(0), data(0)
+ : parent(0), path("--invalid--"), flags(0), data(0)
{
info.user = sys::Process::GetCurrentUserId();
info.group = sys::Process::GetCurrentGroupId();
// This is required because correctly setting the data may depend on other
// things in the Archive.
ArchiveMember::ArchiveMember(Archive* PAR)
- : next(0), prev(0), parent(PAR), path(), flags(0), data(0)
+ : parent(PAR), path(), flags(0), data(0)
{
}
}
bool
-Archive::mapToMemory(std::string* ErrMsg)
-{
- mapfile = new sys::MappedFile();
- if (mapfile->open(archPath, sys::MappedFile::READ_ACCESS, ErrMsg))
- return true;
- if (!(base = (char*) mapfile->map(ErrMsg)))
+Archive::mapToMemory(std::string* ErrMsg) {
+ mapfile = MemoryBuffer::getFile(archPath.c_str(), ErrMsg);
+ if (mapfile == 0)
return true;
+ base = mapfile->getBufferStart();
return false;
}
void Archive::cleanUpMemory() {
// Shutdown the file mapping
- if (mapfile) {
- mapfile->close();
- delete mapfile;
-
- mapfile = 0;
- base = 0;
- }
+ delete mapfile;
+ mapfile = 0;
+ base = 0;
// Forget the entire symbol table
symTab.clear();
std::vector<std::string>& symbols,
std::string* ErrMsg) {
std::auto_ptr<MemoryBuffer> Buffer(
- MemoryBuffer::getFileOrSTDIN(&fName.toString()[0],
- fName.toString().size()));
+ MemoryBuffer::getFileOrSTDIN(fName.c_str()));
if (!Buffer.get()) {
if (ErrMsg) *ErrMsg = "Could not open file '" + fName.toString() + "'";
return true;