--- a/hotspot/src/share/vm/utilities/exceptions.cpp	Fri Aug 31 16:39:35 2012 -0700
+++ b/hotspot/src/share/vm/utilities/exceptions.cpp	Sat Sep 01 13:25:18 2012 -0400
@@ -88,7 +88,7 @@
   // adequate stack space.
   // This can happen with stress testing a large value of StackShadowPages
   if (h_exception()->klass() == SystemDictionary::StackOverflowError_klass()) {
-    instanceKlass* ik = instanceKlass::cast(h_exception->klass());
+    InstanceKlass* ik = InstanceKlass::cast(h_exception->klass());
     assert(ik->is_initialized(),
            "need to increase min_stack_allowed calculation");
   }
@@ -219,10 +219,10 @@
 void Exceptions::throw_stack_overflow_exception(Thread* THREAD, const char* file, int line, methodHandle method) {
   Handle exception;
   if (!THREAD->has_pending_exception()) {
-    klassOop k = SystemDictionary::StackOverflowError_klass();
-    oop e = instanceKlass::cast(k)->allocate_instance(CHECK);
+    Klass* k = SystemDictionary::StackOverflowError_klass();
+    oop e = InstanceKlass::cast(k)->allocate_instance(CHECK);
     exception = Handle(THREAD, e);  // fill_in_stack trace does gc
-    assert(instanceKlass::cast(k)->is_initialized(), "need to increase min_stack_allowed calculation");
+    assert(InstanceKlass::cast(k)->is_initialized(), "need to increase min_stack_allowed calculation");
     if (StackTraceInThrowable) {
       java_lang_Throwable::fill_in_stack_trace(exception, method());
     }
@@ -257,7 +257,7 @@
   Handle h_exception;
 
   // Resolve exception klass
-  klassOop ik = SystemDictionary::resolve_or_fail(name, h_loader, h_protection_domain, true, thread);
+  Klass* ik = SystemDictionary::resolve_or_fail(name, h_loader, h_protection_domain, true, thread);
   instanceKlassHandle klass(thread, ik);
 
   if (!thread->has_pending_exception()) {
@@ -451,7 +451,7 @@
         message = java_lang_String::as_utf8_string(msg);
       }
     }
-    debug_check_abort(instanceKlass::cast(exception()->klass())->external_name(), message);
+    debug_check_abort(InstanceKlass::cast(exception()->klass())->external_name(), message);
   }
 }
 #endif