1.1 --- a/src/share/vm/shark/sharkRuntime.cpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/share/vm/shark/sharkRuntime.cpp Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
1.7 * Copyright 2008, 2009, 2010 Red Hat, Inc.
1.8 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.9 *
1.10 @@ -24,7 +24,6 @@
1.11 */
1.12
1.13 #include "precompiled.hpp"
1.14 -#include "oops/klassOop.hpp"
1.15 #include "runtime/biasedLocking.hpp"
1.16 #include "runtime/deoptimization.hpp"
1.17 #include "runtime/thread.hpp"
1.18 @@ -43,13 +42,13 @@
1.19 KlassHandle exc_klass(thread, ((oop) tos_at(thread, 0))->klass());
1.20
1.21 for (int i = 0; i < num_indexes; i++) {
1.22 - klassOop tmp = pool->klass_at(indexes[i], CHECK_0);
1.23 + Klass* tmp = pool->klass_at(indexes[i], CHECK_0);
1.24 KlassHandle chk_klass(thread, tmp);
1.25
1.26 if (exc_klass() == chk_klass())
1.27 return i;
1.28
1.29 - if (exc_klass()->klass_part()->is_subtype_of(chk_klass()))
1.30 + if (exc_klass()->is_subtype_of(chk_klass()))
1.31 return i;
1.32 }
1.33
1.34 @@ -83,7 +82,7 @@
1.35 JRT_END
1.36
1.37 JRT_ENTRY(void, SharkRuntime::new_instance(JavaThread* thread, int index))
1.38 - klassOop k_oop = method(thread)->constants()->klass_at(index, CHECK);
1.39 + Klass* k_oop = method(thread)->constants()->klass_at(index, CHECK);
1.40 instanceKlassHandle klass(THREAD, k_oop);
1.41
1.42 // Make sure we are not instantiating an abstract klass
1.43 @@ -120,7 +119,7 @@
1.44 JRT_ENTRY(void, SharkRuntime::anewarray(JavaThread* thread,
1.45 int index,
1.46 int size))
1.47 - klassOop klass = method(thread)->constants()->klass_at(index, CHECK);
1.48 + Klass* klass = method(thread)->constants()->klass_at(index, CHECK);
1.49 objArrayOop obj = oopFactory::new_objArray(klass, size, CHECK);
1.50 thread->set_vm_result(obj);
1.51 JRT_END
1.52 @@ -129,7 +128,7 @@
1.53 int index,
1.54 int ndims,
1.55 int* dims))
1.56 - klassOop klass = method(thread)->constants()->klass_at(index, CHECK);
1.57 + Klass* klass = method(thread)->constants()->klass_at(index, CHECK);
1.58 oop obj = arrayKlass::cast(klass)->multi_allocate(ndims, dims, CHECK);
1.59 thread->set_vm_result(obj);
1.60 JRT_END
1.61 @@ -137,8 +136,8 @@
1.62 JRT_ENTRY(void, SharkRuntime::register_finalizer(JavaThread* thread,
1.63 oop object))
1.64 assert(object->is_oop(), "should be");
1.65 - assert(object->klass()->klass_part()->has_finalizer(), "should have");
1.66 - instanceKlass::register_finalizer(instanceOop(object), CHECK);
1.67 + assert(object->klass()->has_finalizer(), "should have");
1.68 + InstanceKlass::register_finalizer(instanceOop(object), CHECK);
1.69 JRT_END
1.70
1.71 JRT_ENTRY(void, SharkRuntime::throw_ArithmeticException(JavaThread* thread,
1.72 @@ -196,8 +195,8 @@
1.73 tty->print_cr("");
1.74 }
1.75
1.76 -bool SharkRuntime::is_subtype_of(klassOop check_klass, klassOop object_klass) {
1.77 - return object_klass->klass_part()->is_subtype_of(check_klass);
1.78 +bool SharkRuntime::is_subtype_of(Klass* check_klass, Klass* object_klass) {
1.79 + return object_klass->is_subtype_of(check_klass);
1.80 }
1.81
1.82 int SharkRuntime::uncommon_trap(JavaThread* thread, int trap_request) {
