src/cpu/x86/vm/methodHandles_x86.cpp

rev 8978 : imported patch remove_err_msg
rev 8979 : [mq]: vmerr_static

@@ -51,11 +51,11 @@
   __ movptr(klass_reg, Address(klass_reg, java_lang_Class::klass_offset_in_bytes()));
 }
 
 #ifdef ASSERT
 static int check_nonzero(const char* xname, int x) {
-  assert(x != 0, err_msg("%s should be nonzero", xname));
+  assert(x != 0, "%s should be nonzero", xname);
   return x;
 }
 #define NONZERO(x) check_nonzero(#x, x)
 #else //ASSERT
 #define NONZERO(x) (x)

@@ -454,11 +454,11 @@
                                  L_incompatible_class_change_error);
       break;
     }
 
     default:
-      fatal(err_msg_res("unexpected intrinsic %d: %s", iid, vmIntrinsics::name_at(iid)));
+      fatal("unexpected intrinsic %d: %s", iid, vmIntrinsics::name_at(iid));
       break;
     }
 
     // Live at this point:
     //   rbx_method