diff options
Diffstat (limited to 'compiler/dex/quick')
| -rw-r--r-- | compiler/dex/quick/codegen_util.cc | 4 | ||||
| -rw-r--r-- | compiler/dex/quick/lazy_debug_frame_opcode_writer.h | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/compiler/dex/quick/codegen_util.cc b/compiler/dex/quick/codegen_util.cc index d5ac34186b..bd55fa64e6 100644 --- a/compiler/dex/quick/codegen_util.cc +++ b/compiler/dex/quick/codegen_util.cc @@ -16,6 +16,8 @@ #include "mir_to_lir-inl.h" +#include <endian.h> + #include "base/bit_vector-inl.h" #include "dex/mir_graph.h" #include "driver/compiler_driver.h" @@ -841,7 +843,7 @@ void Mir2Lir::CreateNativeGcMap() { references_buffer[i] = static_cast<uint8_t>( raw_storage[i / sizeof(raw_storage[0])] >> (8u * (i % sizeof(raw_storage[0])))); } - native_gc_map_builder.AddEntry(native_offset, &references_buffer[0]); + native_gc_map_builder.AddEntry(native_offset, references_buffer.data()); prev_mir = mir; } } diff --git a/compiler/dex/quick/lazy_debug_frame_opcode_writer.h b/compiler/dex/quick/lazy_debug_frame_opcode_writer.h index 3e9fb96bfa..c425fc852d 100644 --- a/compiler/dex/quick/lazy_debug_frame_opcode_writer.h +++ b/compiler/dex/quick/lazy_debug_frame_opcode_writer.h @@ -28,8 +28,8 @@ namespace dwarf { // When we are generating the CFI code, we do not know the instuction offsets, // this class stores the LIR references and patches the instruction stream later. class LazyDebugFrameOpCodeWriter FINAL - : public DebugFrameOpCodeWriter<ArenaAllocatorAdapter<uint8_t>> { - typedef DebugFrameOpCodeWriter<ArenaAllocatorAdapter<uint8_t>> Base; + : public DebugFrameOpCodeWriter<ArenaVector<uint8_t>> { + typedef DebugFrameOpCodeWriter<ArenaVector<uint8_t>> Base; public: // This method is implicitely called the by opcode writers. virtual void ImplicitlyAdvancePC() OVERRIDE { |