--- a/hotspot/src/share/vm/services/threadService.hpp	Fri Aug 31 16:39:35 2012 -0700
+++ b/hotspot/src/share/vm/services/threadService.hpp	Sat Sep 01 13:25:18 2012 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -68,7 +68,7 @@
   static bool          _thread_allocated_memory_enabled;
 
   // Need to keep the list of thread dump result that
-  // keep references to methodOop since thread dump can be
+  // keep references to Method* since thread dump can be
   // requested by multiple threads concurrently.
   static ThreadDumpResult* _threaddump_list;
 
@@ -272,12 +272,12 @@
   void            add_jni_locked_monitor(oop object) { _jni_locked_monitors->append(object); }
 };
 
-// StackFrameInfo for keeping methodOop and bci during
+// StackFrameInfo for keeping Method* and bci during
 // stack walking for later construction of StackTraceElement[]
 // Java instances
 class StackFrameInfo : public CHeapObj<mtInternal> {
  private:
-  methodOop           _method;
+  Method*             _method;
   int                 _bci;
   GrowableArray<oop>* _locked_monitors; // list of object monitors locked by this frame
 
@@ -289,7 +289,7 @@
       delete _locked_monitors;
     }
   };
-  methodOop method() const       { return _method; }
+  Method* method() const       { return _method; }
   int       bci()    const       { return _bci; }
   void      oops_do(OopClosure* f);