1.1 --- a/src/share/vm/shark/sharkRuntime.hpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/share/vm/shark/sharkRuntime.hpp 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 @@ -27,7 +27,6 @@
1.11 #define SHARE_VM_SHARK_SHARKRUNTIME_HPP
1.12
1.13 #include "memory/allocation.hpp"
1.14 -#include "oops/klassOop.hpp"
1.15 #include "runtime/thread.hpp"
1.16 #include "shark/llvmHeaders.hpp"
1.17 #include "shark/llvmValue.hpp"
1.18 @@ -71,7 +70,7 @@
1.19 static const SharkFrame* last_frame(JavaThread *thread) {
1.20 return thread->last_frame().zero_sharkframe();
1.21 }
1.22 - static methodOop method(JavaThread *thread) {
1.23 + static Method* method(JavaThread *thread) {
1.24 return last_frame(thread)->method();
1.25 }
1.26 static address bcp(JavaThread *thread, int bci) {
1.27 @@ -87,7 +86,7 @@
1.28 // Non-VM calls
1.29 public:
1.30 static void dump(const char *name, intptr_t value);
1.31 - static bool is_subtype_of(klassOop check_klass, klassOop object_klass);
1.32 + static bool is_subtype_of(Klass* check_klass, Klass* object_klass);
1.33 static int uncommon_trap(JavaThread* thread, int trap_request);
1.34 };
1.35
