[yaml2obj][ELF] Just let this class own its buffer.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@184456 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Sean Silva 2013-06-20 19:11:41 +00:00
parent 201c66c9b0
commit b14f972ed6

View File

@ -69,11 +69,12 @@ public:
namespace { namespace {
class ContiguousBlobAccumulator { class ContiguousBlobAccumulator {
const uint64_t InitialOffset; const uint64_t InitialOffset;
SmallVector<char, 128> Buf;
raw_svector_ostream OS; raw_svector_ostream OS;
public: public:
ContiguousBlobAccumulator(uint64_t InitialOffset_, SmallVectorImpl<char> &Buf) ContiguousBlobAccumulator(uint64_t InitialOffset_)
: InitialOffset(InitialOffset_), OS(Buf) {} : InitialOffset(InitialOffset_), Buf(), OS(Buf) {}
raw_ostream &getOS() { return OS; } raw_ostream &getOS() { return OS; }
uint64_t currentOffset() const { return InitialOffset + OS.tell(); } uint64_t currentOffset() const { return InitialOffset + OS.tell(); }
void writeBlobToStream(raw_ostream &Out) { Out << OS.str(); } void writeBlobToStream(raw_ostream &Out) { Out << OS.str(); }
@ -230,12 +231,11 @@ static int writeELF(raw_ostream &OS, const ELFYAML::Object &Doc) {
} }
StringTableBuilder SHStrTab; StringTableBuilder SHStrTab;
SmallVector<char, 128> Buf;
// XXX: This offset is tightly coupled with the order that we write // XXX: This offset is tightly coupled with the order that we write
// things to `OS`. // things to `OS`.
const size_t SectionContentBeginOffset = const size_t SectionContentBeginOffset =
Header.e_ehsize + Header.e_shentsize * Header.e_shnum; Header.e_ehsize + Header.e_shentsize * Header.e_shnum;
ContiguousBlobAccumulator CBA(SectionContentBeginOffset, Buf); ContiguousBlobAccumulator CBA(SectionContentBeginOffset);
std::vector<Elf_Shdr> SHeaders; std::vector<Elf_Shdr> SHeaders;
{ {
// Ensure SHN_UNDEF entry is present. An all-zero section header is a // Ensure SHN_UNDEF entry is present. An all-zero section header is a