1.1 --- a/src/share/vm/code/dependencies.hpp Wed Nov 19 15:02:01 2014 -0800 1.2 +++ b/src/share/vm/code/dependencies.hpp Mon Dec 01 13:06:20 2014 -0500 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. 1.6 + * Copyright (c) 2005, 2014, 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 @@ -287,7 +287,7 @@ 1.11 // In that case, there would be a middle ground between concrete 1.12 // and abstract (as defined by the Java language and VM). 1.13 static bool is_concrete_klass(Klass* k); // k is instantiable 1.14 - static bool is_concrete_method(Method* m); // m is invocable 1.15 + static bool is_concrete_method(Method* m, Klass* k); // m is invocable 1.16 static Klass* find_finalizable_subclass(Klass* k); 1.17 1.18 // These versions of the concreteness queries work through the CI. 1.19 @@ -301,7 +301,6 @@ 1.20 // not go back into the VM to get their value; they must cache the 1.21 // bit in the CI, either eagerly or lazily.) 1.22 static bool is_concrete_klass(ciInstanceKlass* k); // k appears instantiable 1.23 - static bool is_concrete_method(ciMethod* m); // m appears invocable 1.24 static bool has_finalizable_subclass(ciInstanceKlass* k); 1.25 1.26 // As a general rule, it is OK to compile under the assumption that 1.27 @@ -348,7 +347,6 @@ 1.28 static Klass* find_unique_concrete_subtype(Klass* ctxk); 1.29 static Method* find_unique_concrete_method(Klass* ctxk, Method* m); 1.30 static int find_exclusive_concrete_subtypes(Klass* ctxk, int klen, Klass* k[]); 1.31 - static int find_exclusive_concrete_methods(Klass* ctxk, int mlen, Method* m[]); 1.32 1.33 // Create the encoding which will be stored in an nmethod. 1.34 void encode_content_bytes();