diff src/share/vm/c1/c1_LIRAssembler.cpp @ 6646:c38f13903fdf

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ just before the NPG (no perm gen) changeset
author Doug Simon <doug.simon@oracle.com>
date Mon, 29 Oct 2012 21:10:04 +0100
parents 957c266d8bc5 7a302948f5a4
children e522a00b91aa
line wrap: on
line diff
--- a/src/share/vm/c1/c1_LIRAssembler.cpp	Mon Oct 29 20:02:54 2012 +0100
+++ b/src/share/vm/c1/c1_LIRAssembler.cpp	Mon Oct 29 21:10:04 2012 +0100
@@ -449,10 +449,10 @@
 
   switch (op->code()) {
   case lir_static_call:
+  case lir_dynamic_call:
     call(op, relocInfo::static_call_type);
     break;
   case lir_optvirtual_call:
-  case lir_dynamic_call:
     call(op, relocInfo::opt_virtual_call_type);
     break;
   case lir_icvirtual_call:
@@ -461,7 +461,9 @@
   case lir_virtual_call:
     vtable_call(op);
     break;
-  default: ShouldNotReachHere();
+  default:
+    fatal(err_msg_res("unexpected op code: %s", op->name()));
+    break;
   }
 
   // JSR 292