--- a/hotspot/src/share/vm/code/scopeDesc.hpp	Fri Aug 31 16:39:35 2012 -0700
+++ b/hotspot/src/share/vm/code/scopeDesc.hpp	Sat Sep 01 13:25:18 2012 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, 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
@@ -27,17 +27,17 @@
 
 #include "code/debugInfo.hpp"
 #include "code/pcDesc.hpp"
-#include "oops/methodOop.hpp"
+#include "oops/method.hpp"
 #include "utilities/growableArray.hpp"
 
 // SimpleScopeDesc is used when all you need to extract from
-// a given pc,nmethod pair is a methodOop and a bci. This is
+// a given pc,nmethod pair is a Method* and a bci. This is
 // quite a bit faster than allocating a full ScopeDesc, but
 // very limited in abilities.
 
 class SimpleScopeDesc : public StackObj {
  private:
-  methodOop _method;
+  Method* _method;
   int _bci;
 
  public:
@@ -46,11 +46,11 @@
     assert(pc_desc != NULL, "Must be able to find matching PcDesc");
     DebugInfoReadStream buffer(code, pc_desc->scope_decode_offset());
     int ignore_sender = buffer.read_int();
-    _method           = methodOop(buffer.read_oop());
+    _method           = buffer.read_method();
     _bci              = buffer.read_bci();
   }
 
-  methodOop method() { return _method; }
+  Method* method() { return _method; }
   int bci() { return _bci; }
 };
 
@@ -68,7 +68,7 @@
   ScopeDesc(const nmethod* code, int decode_offset, bool reexecute, bool return_oop);
 
   // JVM state
-  methodHandle method()   const { return _method; }
+  Method* method()      const { return _method; }
   int          bci()      const { return _bci;    }
   bool should_reexecute() const { return _reexecute; }
   bool return_oop()       const { return _return_oop; }
@@ -94,7 +94,7 @@
   ScopeDesc(const ScopeDesc* parent);
 
   // JVM state
-  methodHandle  _method;
+  Method*       _method;
   int           _bci;
   bool          _reexecute;
   bool          _return_oop;