# HG changeset patch
# User vladidan
# Date 1385955315 18000
# Node ID 3fbb71fdc6e5cab6b6dec7295d95ddd957e1aa81
# Parent  b6b9a5d4cda05f76c16dfc502b047821d3271084# Parent  77b028ba548ca79724064ec9660fa6054b8c9396
Merge

diff -r b6b9a5d4cda0 -r 3fbb71fdc6e5 src/share/vm/prims/jvmtiImpl.hpp
--- a/src/share/vm/prims/jvmtiImpl.hpp	Fri Nov 29 11:20:34 2013 -0800
+++ b/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();
 };