diff -r caf5eb7dd4a7 -r 882756847a04 hotspot/src/share/vm/opto/runtime.hpp
--- a/hotspot/src/share/vm/opto/runtime.hpp	Fri Aug 31 16:39:35 2012 -0700
+++ b/hotspot/src/share/vm/opto/runtime.hpp	Sat Sep 01 13:25:18 2012 -0400
@@ -140,11 +140,11 @@
   // =================================
 
   // Allocate storage for a Java instance.
-  static void new_instance_C(klassOopDesc* instance_klass, JavaThread *thread);
+  static void new_instance_C(Klass* instance_klass, JavaThread *thread);
 
   // Allocate storage for a objArray or typeArray
-  static void new_array_C(klassOopDesc* array_klass, int len, JavaThread *thread);
-  static void new_array_nozero_C(klassOopDesc* array_klass, int len, JavaThread *thread);
+  static void new_array_C(Klass* array_klass, int len, JavaThread *thread);
+  static void new_array_nozero_C(Klass* array_klass, int len, JavaThread *thread);
 
   // Post-slow-path-allocation, pre-initializing-stores step for
   // implementing ReduceInitialCardMarks
@@ -152,11 +152,11 @@
 
   // Allocate storage for a multi-dimensional arrays
   // Note: needs to be fixed for arbitrary number of dimensions
-  static void multianewarray2_C(klassOopDesc* klass, int len1, int len2, JavaThread *thread);
-  static void multianewarray3_C(klassOopDesc* klass, int len1, int len2, int len3, JavaThread *thread);
-  static void multianewarray4_C(klassOopDesc* klass, int len1, int len2, int len3, int len4, JavaThread *thread);
-  static void multianewarray5_C(klassOopDesc* klass, int len1, int len2, int len3, int len4, int len5, JavaThread *thread);
-  static void multianewarrayN_C(klassOopDesc* klass, arrayOopDesc* dims, JavaThread *thread);
+  static void multianewarray2_C(Klass* klass, int len1, int len2, JavaThread *thread);
+  static void multianewarray3_C(Klass* klass, int len1, int len2, int len3, JavaThread *thread);
+  static void multianewarray4_C(Klass* klass, int len1, int len2, int len3, int len4, JavaThread *thread);
+  static void multianewarray5_C(Klass* klass, int len1, int len2, int len3, int len4, int len5, JavaThread *thread);
+  static void multianewarrayN_C(Klass* klass, arrayOopDesc* dims, JavaThread *thread);
   static void g1_wb_pre_C(oopDesc* orig, JavaThread* thread);
   static void g1_wb_post_C(void* card_addr, JavaThread* thread);