// MemoryBufferMem implementation.
//===----------------------------------------------------------------------===//
-/// CopyStringRef - Copies contents of a StringRef into a block of memory.
+/// CopyStringRef - Copies contents of a StringRef into a block of memory and
+/// null-terminates it.
static void CopyStringRef(char *Memory, StringRef Data) {
if (!Data.empty())
memcpy(Memory, Data.data(), Data.size());
+ Memory[Data.size()] = 0; // Null terminate string.
}
namespace {
SmallString<256> NameBuf;
StringRef NameRef = Alloc.Name.toStringRef(NameBuf);
- char *Mem =
- static_cast<char *>(operator new(N + sizeof(size_t) + NameRef.size()));
- *reinterpret_cast<size_t *>(Mem + N) = NameRef.size();
- CopyStringRef(Mem + N + sizeof(size_t), NameRef);
+ char *Mem = static_cast<char *>(operator new(N + NameRef.size() + 1));
+ CopyStringRef(Mem + N, NameRef);
return Mem;
}
StringRef getBufferIdentifier() const override {
// The name is stored after the class itself.
- return StringRef(reinterpret_cast<const char *>(this + 1) + sizeof(size_t),
- *reinterpret_cast<const size_t *>(this + 1));
+ return StringRef(reinterpret_cast<const char *>(this + 1));
}
MemoryBuffer::BufferKind getBufferKind() const override {
StringRef getBufferIdentifier() const override {
// The name is stored after the class itself.
- return StringRef(reinterpret_cast<const char *>(this + 1) + sizeof(size_t),
- *reinterpret_cast<const size_t *>(this + 1));
+ return StringRef(reinterpret_cast<const char *>(this + 1));
}
MemoryBuffer::BufferKind getBufferKind() const override {
// that MemoryBuffer and data are aligned so PointerIntPair works with them.
SmallString<256> NameBuf;
StringRef NameRef = BufferName.toStringRef(NameBuf);
-
- size_t StringLen = sizeof(MemBuffer) + sizeof(size_t) + NameRef.size();
+ size_t StringLen = sizeof(MemBuffer) + NameRef.size() + 1;
size_t RealLen = StringLen + Size + 1 + BufAlign.value();
if (RealLen <= Size) // Check for rollover.
return nullptr;
return nullptr;
// The name is stored after the class itself.
- *reinterpret_cast<size_t *>(Mem + sizeof(MemBuffer)) =
- NameRef.size(); // Null terminate buffer.
- CopyStringRef(Mem + sizeof(MemBuffer) + sizeof(size_t), NameRef);
+ CopyStringRef(Mem + sizeof(MemBuffer), NameRef);
// The buffer begins after the name and must be aligned.
char *Buf = (char *)alignAddr(Mem + StringLen, BufAlign);
+ Buf[Size] = 0; // Null terminate buffer.
auto *Ret = new (Mem) MemBuffer(StringRef(Buf, Size), true);
- Buf[Size] = 0; // Null terminate buffer.
return std::unique_ptr<WritableMemoryBuffer>(Ret);
}