diff options
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/dex/mir_graph.cc | 4 | ||||
| -rw-r--r-- | compiler/utils/scoped_arena_allocator.cc | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/compiler/dex/mir_graph.cc b/compiler/dex/mir_graph.cc index 29972ddba5..f69d63c135 100644 --- a/compiler/dex/mir_graph.cc +++ b/compiler/dex/mir_graph.cc @@ -1209,6 +1209,10 @@ void MIRGraph::DisassembleExtendedInstr(const MIR* mir, std::string* decoded_mir int defs = (ssa_rep != nullptr) ? ssa_rep->num_defs : 0; int uses = (ssa_rep != nullptr) ? ssa_rep->num_uses : 0; + if (opcode < kMirOpFirst) { + return; // It is not an extended instruction. + } + decoded_mir->append(extended_mir_op_names_[opcode - kMirOpFirst]); switch (opcode) { diff --git a/compiler/utils/scoped_arena_allocator.cc b/compiler/utils/scoped_arena_allocator.cc index 26161501b3..d9e0619de6 100644 --- a/compiler/utils/scoped_arena_allocator.cc +++ b/compiler/utils/scoped_arena_allocator.cc @@ -96,6 +96,7 @@ void* ArenaStack::AllocValgrind(size_t bytes, ArenaAllocKind kind) { uint8_t* ptr = top_ptr_; if (UNLIKELY(static_cast<size_t>(top_end_ - ptr) < rounded_bytes)) { ptr = AllocateFromNextArena(rounded_bytes); + CHECK(ptr != nullptr) << "Failed to allocate memory"; } CurrentStats()->RecordAlloc(bytes, kind); top_ptr_ = ptr + rounded_bytes; |