commit 5aa42926cf7728e34399847e81f3886d9cc7616f
author David Srbecky <dsrbecky@google.com> Thu Feb 20 17:20:12 2020 +0000
committer Treehugger Robot <treehugger-gerrit@google.com> Thu Feb 20 19:02:13 2020 +0000
tree 8e812a65f2acad56d8a4f52300cc79644d1acd75
parent ef46e101be0afb84898a9ac37af1f1f6c1677cf4

Fix iteration in RemoveNativeDebugInfoForJit

Get the next pointer before deletion clears it.

Change-Id: Ic471d88a9a79e6b1b84e063f61c78bd2870eb76c

runtime/jit/debugger_interface.cc

diff --git a/runtime/jit/debugger_interface.cc b/runtime/jit/debugger_interface.cc
index cdd7775..1ca4165 100644
--- a/runtime/jit/debugger_interface.cc
+++ b/runtime/jit/debugger_interface.cc
@@ -576,10 +576,12 @@
   RepackEntries(/*compress_entries=*/ true, removed);
 
   // Remove entries which are not allowed to be packed (containing single method each).
-  for (const JITCodeEntry* it = __jit_debug_descriptor.head_; it != nullptr; it = it->next_) {
+  for (const JITCodeEntry* it = __jit_debug_descriptor.head_; it != nullptr;) {
+    const JITCodeEntry* next = it->next_;
     if (!it->allow_packing_ && std::binary_search(removed.begin(), removed.end(), it->addr_)) {
       DeleteJITCodeEntryInternal<JitNativeInfo>(/*entry=*/ it);
     }
+    it = next;
   }
 }