--- a/hotspot/src/share/vm/interpreter/bytecodes.cpp	Sun Oct 11 16:19:25 2009 -0700
+++ b/hotspot/src/share/vm/interpreter/bytecodes.cpp	Thu Apr 22 13:23:15 2010 -0700
@@ -426,7 +426,9 @@
         if (is_defined(i)) {
           Code code = cast(i);
           Code java = java_code(code);
-          if (can_trap(code) && !can_trap(java)) fatal2("%s can trap => %s can trap, too", name(code), name(java));
+          if (can_trap(code) && !can_trap(java))
+            fatal(err_msg("%s can trap => %s can trap, too", name(code),
+                          name(java)));
         }
       }
     }