commit c8f419b02d081c12cd5936ee62f7ec156a5a3ad7
author android-build-team Robot <android-build-team-robot@google.com> Sat Jun 29 23:19:31 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sat Jun 29 23:19:31 2019 +0000
tree ae4e93d29900d780a087dfb022b226dedb828592
parent 570b0d96072e5c08d4f2af43048baa763a129685
parent 83a42fd1e4ce5d6b1f765b3993b565afe75176d4

Snap for 5698755 from 83a42fd1e4ce5d6b1f765b3993b565afe75176d4 to qt-c2f2-release

Change-Id: If8950174fd3c5af15984214add4fcd450b22c4cc

runtime/jit/jit_code_cache.cc

diff --git a/runtime/jit/jit_code_cache.cc b/runtime/jit/jit_code_cache.cc
index 333f2da..a6aefc4 100644
--- a/runtime/jit/jit_code_cache.cc
+++ b/runtime/jit/jit_code_cache.cc
@@ -1060,8 +1060,8 @@
     }
 
     // Invalidate i-cache for the executable mapping.
-    uint8_t* x_memory = reinterpret_cast<uint8_t*>(method_header);
     if (cache_flush_success) {
+      uint8_t* x_memory = reinterpret_cast<uint8_t*>(FromCodeToAllocation(code_ptr));
       cache_flush_success = FlushCpuCaches(x_memory, x_memory + total_size);
     }