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
authorvladidan
Sun, 01 Dec 2013 22:35:15 -0500
changeset 21909 1849711795fc
parent 21907 dc526f991405 (current diff)
parent 21908 7f10463cc5a5 (diff)
child 21911 f7a77bce0bcf
child 21917 325b980b3208
Merge
--- a/hotspot/src/share/vm/prims/jvmtiImpl.hpp	Fri Nov 29 11:20:34 2013 -0800
+++ b/hotspot/src/share/vm/prims/jvmtiImpl.hpp	Sun Dec 01 22:35:15 2013 -0500
@@ -299,7 +299,7 @@
   static inline bool is_breakpoint(address bcp);
 
   static void oops_do(OopClosure* f);
-  static void metadata_do(void f(Metadata*));
+  static void metadata_do(void f(Metadata*)) NOT_JVMTI_RETURN;
   static void gc_epilogue();
 };
jdk-sandbox