--- a/src/share/vm/runtime/deoptimization.cpp	Mon Nov 17 14:58:39 2014 +0100
+++ b/src/share/vm/runtime/deoptimization.cpp	Tue Oct 21 11:23:41 2014 +0200
@@ -2074,19 +2074,22 @@
   "intrinsic" GRAAL_ONLY("_or_type_checked_inlining"),
   "bimorphic" GRAAL_ONLY("_or_optimized_type_check"),
   "unloaded",
-  "uninitialized" GRAAL_ONLY("_or_unresolved"),
+  "uninitialized",
   "unreached",
-  "unhandled" GRAAL_ONLY("_or_not_compiled_exception_handler"),
+  "unhandled",
   "constraint",
   "div0_check",
-  "age" GRAAL_ONLY("_or_jsr_mismatch"),
+  "age",
   "predicate",
   "loop_limit_check",
   "speculate_class_check",
-  "rtm_state_change"
+  "rtm_state_change",
 #ifdef GRAAL
   "aliasing",
   "transfer_to_interpreter",
+  "not_compiled_exception_handler",
+  "unresolved",
+  "jsr_mismatch"
 #endif
 };
 const char* Deoptimization::_trap_action_name[Action_LIMIT] = {

--- a/src/share/vm/runtime/deoptimization.hpp	Mon Nov 17 14:58:39 2014 +0100
+++ b/src/share/vm/runtime/deoptimization.hpp	Tue Oct 21 11:23:41 2014 +0200
@@ -77,15 +77,12 @@
 #ifdef GRAAL
     Reason_aliasing,              // optimistic assumption about aliasing failed
     Reason_transfer_to_interpreter, // explicit transferToInterpreter()
+    Reason_not_compiled_exception_handler,
+    Reason_unresolved,
+    Reason_jsr_mismatch,
 #endif
     Reason_LIMIT,
 
-#ifdef GRAAL
-    Reason_not_compiled_exception_handler = Reason_unhandled,
-    Reason_unresolved                     = Reason_uninitialized,
-    Reason_jsr_mismatch                   = Reason_age,
-#endif
-
     // Note:  Keep this enum in sync. with _trap_reason_name.
     Reason_RECORDED_LIMIT = Reason_bimorphic  // some are not recorded per bc
     // Note:  Reason_RECORDED_LIMIT should be < 8 to fit into 3 bits of

--- a/src/share/vm/runtime/java.cpp	Mon Nov 17 14:58:39 2014 +0100
+++ b/src/share/vm/runtime/java.cpp	Tue Oct 21 11:23:41 2014 +0200
@@ -283,7 +283,17 @@
     IndexSet::print_statistics();
   }
 #endif // ASSERT
-#endif // COMPILER2
+#else
+#ifdef GRALL
+#ifndef COMPILER1
+  if ((TraceDeoptimization || LogVMOutput || LogCompilation) && UseCompiler) {
+    FlagSetting fs(DisplayVMOutput, DisplayVMOutput && TraceDeoptimization);
+    Deoptimization::print_statistics();
+    SharedRuntime::print_statistics();
+  }
+#endif
+#endif
+#endif
 
   if (PrintNMethodStatistics) {
     nmethod::print_statistics();