src/hotspot/share/prims/stackwalk.cpp

rev 60253 : imported patch 8249192-coleenp-review

@@ -34,10 +34,11 @@
 #include "oops/objArrayOop.inline.hpp"
 #include "prims/stackwalk.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/javaCalls.hpp"
+#include "runtime/monitorInfo.inline.hpp"
 #include "runtime/thread.inline.hpp"
 #include "runtime/vframe.inline.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 // setup and cleanup actions

@@ -286,10 +287,13 @@
 // Fill LiveStackFrameInfo with locals, monitors, and expressions
 void LiveFrameStream::fill_live_stackframe(Handle stackFrame,
                                            const methodHandle& method, TRAPS) {
   fill_stackframe(stackFrame, method, CHECK);
   if (_jvf != NULL) {
+    ResourceMark rm;
+    HandleMark hm;
+
     StackValueCollection* locals = _jvf->locals();
     StackValueCollection* expressions = _jvf->expressions();
     GrowableArray<MonitorInfo*>* monitors = _jvf->monitors();
 
     int mode = 0;