Add ElfImage to hold ELF image address and size.
(cherry picked from commit 578763dc6630156b163933720a85f8d34cbab652)
Change-Id: I76d03130eabb100869ea941c9e4fd92cc9244eeb
diff --git a/src/compiler_llvm/compilation_unit.h b/src/compiler_llvm/compilation_unit.h
index 4a23095..659bc64 100644
--- a/src/compiler_llvm/compilation_unit.h
+++ b/src/compiler_llvm/compilation_unit.h
@@ -18,6 +18,7 @@
#define ART_SRC_COMPILER_LLVM_COMPILATION_UNIT_H_
#include "constants.h"
+#include "elf_image.h"
#include "globals.h"
#include "logging.h"
@@ -76,12 +77,8 @@
bitcode_filename_ = filename;
}
- const byte* GetElfImage() const {
- return reinterpret_cast<const byte*>(&*elf_image_.begin());
- }
-
- size_t GetElfSize() const {
- return elf_image_.size();
+ ElfImage GetElfImage() const {
+ return ElfImage(elf_image_);
}
bool WriteBitcodeToFile();