--- a/hotspot/src/share/vm/prims/jvmtiEnvBase.cpp	Fri Aug 31 16:39:35 2012 -0700
+++ b/hotspot/src/share/vm/prims/jvmtiEnvBase.cpp	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
@@ -588,7 +588,7 @@
 
 
 jclass
-JvmtiEnvBase::get_jni_class_non_null(klassOop k) {
+JvmtiEnvBase::get_jni_class_non_null(Klass* k) {
   assert(k != NULL, "k != NULL");
   return (jclass)jni_reference(Klass::cast(k)->java_mirror());
 }
@@ -600,7 +600,7 @@
 //
 
 bool
-JvmtiEnvBase::get_field_descriptor(klassOop k, jfieldID field, fieldDescriptor* fd) {
+JvmtiEnvBase::get_field_descriptor(Klass* k, jfieldID field, fieldDescriptor* fd) {
   if (!jfieldIDWorkaround::is_valid_jfieldID(k, field)) {
     return false;
   }
@@ -611,7 +611,7 @@
   } else {
     // Non-static field. The fieldID is really the offset of the field within the object.
     int offset = jfieldIDWorkaround::from_instance_jfieldID(k, field);
-    found = instanceKlass::cast(k)->find_field_from_offset(offset, false, fd);
+    found = InstanceKlass::cast(k)->find_field_from_offset(offset, false, fd);
   }
   return found;
 }
@@ -930,7 +930,7 @@
 
   HandleMark hm(current_thread);
   javaVFrame *jvf = javaVFrame::cast(vf);
-  methodOop method = jvf->method();
+  Method* method = jvf->method();
   if (method->is_native()) {
     *location_ptr = -1;
   } else {