diff options
| author | Andreas Gampe <agampe@google.com> | 2015-05-01 16:11:04 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2015-05-01 16:11:04 -0700 |
| commit | e3d623e54c0640b0594eabaa3c3b176dd577927c (patch) | |
| tree | a93cf66be82cc5df61e7bd7cfbadafd76c83f4c4 | |
| parent | 1db3554cf9751d4328d5514b6bee15b6a92b82c4 (diff) | |
| download | art-e3d623e54c0640b0594eabaa3c3b176dd577927c.tar.gz art-e3d623e54c0640b0594eabaa3c3b176dd577927c.tar.bz2 art-e3d623e54c0640b0594eabaa3c3b176dd577927c.zip | |
ART: Fix max build
Change-Id: Id1b9c0ee05b61195d1c1f09a8938df3110c2f2b3
| -rw-r--r-- | compiler/elf_writer_debug.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler/elf_writer_debug.cc b/compiler/elf_writer_debug.cc index db599c4949..5e9cf76788 100644 --- a/compiler/elf_writer_debug.cc +++ b/compiler/elf_writer_debug.cc @@ -18,6 +18,7 @@ #include <unordered_set> +#include "base/casts.h" #include "compiled_method.h" #include "driver/compiler_driver.h" #include "dex_file-inl.h" @@ -198,11 +199,11 @@ void WriteEhFrame(const CompilerDriver* compiler, const int32_t relative_eh_frame_begin = -static_cast<int32_t>(eh_frame->size()); header.PushInt32(relative_eh_frame_begin - 4U); // Binary search table size (number of entries). - header.PushUint32(address_to_fde_offset_map.size()); + header.PushUint32(dchecked_integral_cast<uint32_t>(address_to_fde_offset_map.size())); // Binary search table. for (const auto& address_to_fde_offset : address_to_fde_offset_map) { u_int32_t code_address = address_to_fde_offset.first; - size_t fde_address = address_to_fde_offset.second; + int32_t fde_address = dchecked_integral_cast<int32_t>(address_to_fde_offset.second); eh_frame_hdr_patches->push_back(header.data()->size()); header.PushUint32(code_address); // We know the exact layout (eh_frame is immediately before eh_frame_hdr) |