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
authorkevinw
Mon, 21 Jul 2014 10:42:20 +0000
changeset 25721 9883ebc9eb97
parent 25720 28c69e9cf5e2 (diff)
parent 25719 ef6312344da2 (current diff)
child 25723 b07df7835eac
Merge
hotspot/test/compiler/uncommontrap/TestSpecTrapClassUnloading.java file | annotate | diff | comparison | revisions 
--- a/hotspot/src/os/bsd/dtrace/libjvm_db.c	Fri Jul 18 23:53:59 2014 -0700
+++ b/hotspot/src/os/bsd/dtrace/libjvm_db.c	Mon Jul 21 10:42:20 2014 +0000
@@ -260,6 +260,9 @@
   uint64_t base;
   int err;
 
+  /* Clear *vmp now in case we jump to fail: */
+  memset(vmp, 0, sizeof(VMStructEntry));
+
   err = ps_pglobal_lookup(J->P, LIBJVM_SO, "gHotSpotVMStructs", &sym_addr);
   CHECK_FAIL(err);
   err = read_pointer(J, sym_addr, &gHotSpotVMStructs);
--- a/hotspot/src/os/solaris/dtrace/libjvm_db.c	Fri Jul 18 23:53:59 2014 -0700
+++ b/hotspot/src/os/solaris/dtrace/libjvm_db.c	Mon Jul 21 10:42:20 2014 +0000
@@ -260,6 +260,9 @@
   uint64_t base;
   int err;
 
+  /* Clear *vmp now in case we jump to fail: */
+  memset(vmp, 0, sizeof(VMStructEntry));
+
   err = ps_pglobal_lookup(J->P, LIBJVM_SO, "gHotSpotVMStructs", &sym_addr);
   CHECK_FAIL(err);
   err = read_pointer(J, sym_addr, &gHotSpotVMStructs);
jdk-sandbox