1.1 --- a/src/share/vm/interpreter/linkResolver.hpp Fri Aug 31 16:39:35 2012 -0700 1.2 +++ b/src/share/vm/interpreter/linkResolver.hpp Sat Sep 01 13:25:18 2012 -0400 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. 1.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. 1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.8 * 1.9 * This code is free software; you can redistribute it and/or modify it 1.10 @@ -25,7 +25,7 @@ 1.11 #ifndef SHARE_VM_INTERPRETER_LINKRESOLVER_HPP 1.12 #define SHARE_VM_INTERPRETER_LINKRESOLVER_HPP 1.13 1.14 -#include "oops/methodOop.hpp" 1.15 +#include "oops/method.hpp" 1.16 #include "utilities/top.hpp" 1.17 1.18 // All the necessary definitions for run-time link resolution. 1.19 @@ -94,7 +94,7 @@ 1.20 1.21 BasicType result_type() const { return selected_method()->result_type(); } 1.22 bool has_vtable_index() const { return _vtable_index >= 0; } 1.23 - bool is_statically_bound() const { return _vtable_index == methodOopDesc::nonvirtual_vtable_index; } 1.24 + bool is_statically_bound() const { return _vtable_index == Method::nonvirtual_vtable_index; } 1.25 int vtable_index() const { 1.26 // Even for interface calls the vtable index could be non-negative. 1.27 // See CallInfo::set_interface.