Merge "Force DoDexPcMoveEvent to be NO_INLINE with ASAN"

1 files changed, 4 insertions, 0 deletions

diff --git a/runtime/interpreter/interpreter_switch_impl.cc b/runtime/interpreter/interpreter_switch_impl.cc
index a7a2d1264f..de8c44e304 100644
--- a/runtime/interpreter/interpreter_switch_impl.cc
+++ b/runtime/interpreter/interpreter_switch_impl.cc
@@ -17,6 +17,7 @@
 #include "interpreter_switch_impl.h"
 
 #include "base/enums.h"
+#include "base/memory_tool.h"
 #include "experimental_flags.h"
 #include "interpreter_common.h"
 #include "jit/jit.h"
@@ -118,6 +119,9 @@ namespace interpreter {
 // to detect exceptions thrown by the DexPcMovedEvent itself. These exceptions could be thrown by
 // jvmti-agents while handling breakpoint or single step events. We had to move this into its own
 // function because it was making ExecuteSwitchImpl have too large a stack.
+#ifdef ADDRESS_SANITIZER
+NO_INLINE
+#endif  // ADDRESS_SANITIZER
 static bool DoDexPcMoveEvent(Thread* self,
                              const DexFile::CodeItem* code_item,
                              const ShadowFrame& shadow_frame,