--- a/hotspot/src/share/vm/prims/nativeLookup.cpp	Fri Aug 31 16:39:35 2012 -0700
+++ b/hotspot/src/share/vm/prims/nativeLookup.cpp	Sat Sep 01 13:25:18 2012 -0400
@@ -30,7 +30,7 @@
 #include "memory/resourceArea.hpp"
 #include "memory/universe.inline.hpp"
 #include "oops/instanceKlass.hpp"
-#include "oops/methodOop.hpp"
+#include "oops/method.hpp"
 #include "oops/oop.inline.hpp"
 #include "oops/symbol.hpp"
 #include "prims/jvm_misc.hpp"
@@ -166,7 +166,7 @@
   // gets found the first time around - otherwise an infinite loop can occure. This is
   // another VM/library dependency
   Handle loader(THREAD,
-                instanceKlass::cast(method->method_holder())->class_loader());
+                InstanceKlass::cast(method->method_holder())->class_loader());
   if (loader.is_null()) {
     entry = lookup_special_native(jni_name);
     if (entry == NULL) {
@@ -349,7 +349,7 @@
     TempNewSymbol wrapper_symbol = SymbolTable::probe(wrapper_name, wrapper_name_len);
     if (wrapper_symbol != NULL) {
       KlassHandle kh(method->method_holder());
-      methodOop wrapper_method = Klass::cast(kh())->lookup_method(wrapper_symbol,
+      Method* wrapper_method = Klass::cast(kh())->lookup_method(wrapper_symbol,
                                                                   method->signature());
       if (wrapper_method != NULL && !wrapper_method->is_native()) {
         // we found a wrapper method, use its native entry
@@ -386,7 +386,7 @@
             SharedRuntime::native_method_throw_unsupported_operation_exception_entry() :
             lookup_base(method, in_base_library, CHECK_NULL);
     method->set_native_function(entry,
-      methodOopDesc::native_bind_event_is_interesting);
+      Method::native_bind_event_is_interesting);
     // -verbose:jni printing
     if (PrintJNIResolving) {
       ResourceMark rm(THREAD);
@@ -406,7 +406,7 @@
   TempNewSymbol s_name = SymbolTable::new_symbol(signature,   CATCH);
 
   // Find the class
-  klassOop k = SystemDictionary::resolve_or_fail(c_name, true, CATCH);
+  Klass* k = SystemDictionary::resolve_or_fail(c_name, true, CATCH);
   instanceKlassHandle klass (THREAD, k);
 
   // Find method and invoke standard lookup