--- a/hotspot/src/share/vm/ci/ciTypeArrayKlass.cpp	Fri Aug 31 16:39:35 2012 -0700
+++ b/hotspot/src/share/vm/ci/ciTypeArrayKlass.cpp	Sat Sep 01 13:25:18 2012 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -28,7 +28,7 @@
 
 // ciTypeArrayKlass
 //
-// This class represents a klassOop in the HotSpot virtual machine
+// This class represents a Klass* in the HotSpot virtual machine
 // whose Klass part in a TypeArrayKlass.
 
 // ------------------------------------------------------------------
@@ -43,8 +43,8 @@
 //
 // Implementation of make.
 ciTypeArrayKlass* ciTypeArrayKlass::make_impl(BasicType t) {
-  klassOop k = Universe::typeArrayKlassObj(t);
-  return CURRENT_ENV->get_object(k)->as_type_array_klass();
+  Klass* k = Universe::typeArrayKlassObj(t);
+  return CURRENT_ENV->get_type_array_klass(k);
 }
 
 // ------------------------------------------------------------------