--- a/src/share/vm/runtime/deoptimization.hpp	Mon Nov 12 18:11:17 2012 +0100
+++ b/src/share/vm/runtime/deoptimization.hpp	Mon Nov 12 23:14:12 2012 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -88,7 +88,7 @@
     Reason_loop_limit_check,      // compiler generated loop limits check failed
     Reason_LIMIT,
     Reason_RECORDED_LIMIT = Reason_bimorphic  // some are not recorded per bc
-#endif
+#endif // GRAAL
     // Note:  Keep this enum in sync. with _trap_reason_name.
     // Note:  Reason_RECORDED_LIMIT should be < 8 to fit into 3 bits of
     // DataLayout::trap_bits.  This dependency is enforced indirectly
@@ -383,9 +383,9 @@
   static void popframe_preserve_args(JavaThread* thread, int bytes_to_save, void* start_address);
 
  private:
-  static methodDataOop get_method_data(JavaThread* thread, methodHandle m, bool create_if_missing);
+  static MethodData* get_method_data(JavaThread* thread, methodHandle m, bool create_if_missing);
   // Update the mdo's count and per-BCI reason bits, returning previous state:
-  static ProfileData* query_update_method_data(methodDataHandle trap_mdo,
+  static ProfileData* query_update_method_data(MethodData* trap_mdo,
                                                int trap_bci,
                                                DeoptReason reason,
                                                bool update_total_trap_count,
@@ -407,7 +407,7 @@
   // Note:  Histogram array size is 1-2 Kb.
 
  public:
-  static void update_method_data_from_interpreter(methodDataHandle trap_mdo, int trap_bci, int reason);
+  static void update_method_data_from_interpreter(MethodData* trap_mdo, int trap_bci, int reason);
 };
 
 class DeoptimizationMarker : StackObj {  // for profiling