# HG changeset patch
# User vladidan
# Date 1385955315 18000
# Node ID 1849711795fcac45fe662f33181ad8b1bdc6f2ac
# Parent  dc526f9914056845ee4dfd505d782f4bc9b1584d# Parent  7f10463cc5a57df354b022f6d45f3e88d7e2a0c8
Merge

diff -r dc526f991405 -r 1849711795fc hotspot/src/share/vm/prims/jvmtiImpl.hpp
--- 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();
 };