Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorcoleenp
Tue, 23 Aug 2016 19:20:13 +0000
changeset 40663 e62e7d68f3d2
parent 40661 2fa9b4667357 (current diff)
parent 40662 6e951c9e7318 (diff)
child 40666 83beca9dbc5f
Merge
--- a/hotspot/src/share/vm/prims/jvmtiTagMap.cpp	Tue Aug 23 17:27:56 2016 +0000
+++ b/hotspot/src/share/vm/prims/jvmtiTagMap.cpp	Tue Aug 23 19:20:13 2016 +0000
@@ -3119,6 +3119,11 @@
             }
           }
 
+          // Follow oops from compiled nmethod
+          if (jvf->cb() != NULL && jvf->cb()->is_nmethod()) {
+            blk->set_context(thread_tag, tid, depth, method);
+            jvf->cb()->as_nmethod()->oops_do(blk);
+          }
         } else {
           blk->set_context(thread_tag, tid, depth, method);
           if (is_top_frame) {
jdk-sandbox