# HG changeset patch
# User Tom Rodriguez <tom.rodriguez@oracle.com>
# Date 1442595702 25200
# Node ID c016f4fc2bd713fd7097f6c80541be96e3ea2587
# Parent  cf99b5e5b0b4d63d5a1b754ebef76281a070e6c3
Use separate throws

diff -r cf99b5e5b0b4 -r c016f4fc2bd7 src/share/vm/jvmci/jvmciCompilerToVM.cpp
--- a/src/share/vm/jvmci/jvmciCompilerToVM.cpp	Fri Sep 18 09:47:14 2015 -0700
+++ b/src/share/vm/jvmci/jvmciCompilerToVM.cpp	Fri Sep 18 10:01:42 2015 -0700
@@ -468,21 +468,17 @@
 C2V_END
 
 C2V_VMENTRY(jint, getVtableIndexForInterfaceMethod, (JNIEnv *, jobject, jobject jvmci_type, jobject jvmci_method))
+  ResourceMark rm;
   Klass* klass = CompilerToVM::asKlass(jvmci_type);
   Method* method = CompilerToVM::asMethod(jvmci_method);
-  err_msg error_message("");
   if (klass->is_interface()) {
-    error_message = err_msg("Interface %s should be handled in Java code", klass->external_name());
+    THROW_MSG_0(vmSymbols::java_lang_InternalError(), err_msg("Interface %s should be handled in Java code", klass->external_name()));
   }
   if (!method->method_holder()->is_interface()) {
-    error_message = err_msg("Method %s is not held by an interface, this case should be handled in Java code", method->name_and_sig_as_C_string());
+    THROW_MSG_0(vmSymbols::java_lang_InternalError(), err_msg("Method %s is not held by an interface, this case should be handled in Java code", method->name_and_sig_as_C_string()));
   }
   if (!InstanceKlass::cast(klass)->is_initialized()) {
-    error_message = err_msg("Class %s must be initialized", klass->external_name());
-  }
-  if (error_message.size() > 0) {
-    ResourceMark rm;
-    THROW_MSG_0(vmSymbols::java_lang_InternalError(), error_message);
+    THROW_MSG_0(vmSymbols::java_lang_InternalError(), err_msg("Class %s must be initialized", klass->external_name()));
   }
   return LinkResolver::vtable_index_of_interface_method(klass, method);
 C2V_END