--- a/src/hotspot/share/ci/ciEnv.hpp	Tue Jan 15 10:23:23 2019 +0100
+++ b/src/hotspot/share/ci/ciEnv.hpp	Wed Jan 16 10:16:08 2019 +0100
@@ -343,7 +343,9 @@
   // Cache Jvmti state
   void  cache_jvmti_state();
   bool  jvmti_state_changed() const;
-  bool  should_retain_local_variables() const;
+  bool  should_retain_local_variables() const {
+    return _jvmti_can_access_local_variables || _jvmti_can_pop_frame;
+  }
   bool  jvmti_can_hotswap_or_post_breakpoint() const { return _jvmti_can_hotswap_or_post_breakpoint; }
   bool  jvmti_can_post_on_exceptions()         const { return _jvmti_can_post_on_exceptions; }