--- a/hotspot/src/share/vm/ci/ciObjectFactory.cpp	Mon Oct 19 15:03:58 2015 +0200
+++ b/hotspot/src/share/vm/ci/ciObjectFactory.cpp	Thu Oct 22 13:07:10 2015 -0400
@@ -414,6 +414,7 @@
     metadata_owner_klass = m->as_method()->get_Method()->constants()->pool_holder();
   } else {
     fatal("Not implemented for other types of metadata");
+    return;
   }
 
   oop metadata_holder = metadata_owner_klass->klass_holder();