1.1 --- a/src/share/vm/code/dependencies.cpp Fri Dec 12 09:37:54 2014 -0800
1.2 +++ b/src/share/vm/code/dependencies.cpp Tue Dec 16 14:02:00 2014 -0800
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2005, 2013, 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 @@ -560,7 +560,7 @@
1.11 put_star = !Dependencies::is_concrete_klass((Klass*)arg.metadata_value());
1.12 } else if (arg.is_method()) {
1.13 what = "method ";
1.14 - put_star = !Dependencies::is_concrete_method((Method*)arg.metadata_value());
1.15 + put_star = !Dependencies::is_concrete_method((Method*)arg.metadata_value(), NULL);
1.16 } else if (arg.is_klass()) {
1.17 what = "class ";
1.18 } else {
1.19 @@ -845,8 +845,8 @@
1.20 // Static methods don't override non-static so punt
1.21 return true;
1.22 }
1.23 - if ( !Dependencies::is_concrete_method(lm)
1.24 - && !Dependencies::is_concrete_method(m)
1.25 + if ( !Dependencies::is_concrete_method(lm, k)
1.26 + && !Dependencies::is_concrete_method(m, ctxk)
1.27 && lm->method_holder()->is_subtype_of(m->method_holder()))
1.28 // Method m is overridden by lm, but both are non-concrete.
1.29 return true;
1.30 @@ -882,8 +882,17 @@
1.31 } else if (!k->oop_is_instance()) {
1.32 return false; // no methods to find in an array type
1.33 } else {
1.34 - Method* m = InstanceKlass::cast(k)->find_method(_name, _signature);
1.35 - if (m == NULL || !Dependencies::is_concrete_method(m)) return false;
1.36 + // Search class hierarchy first.
1.37 + Method* m = InstanceKlass::cast(k)->find_instance_method(_name, _signature);
1.38 + if (!Dependencies::is_concrete_method(m, k)) {
1.39 + // Check interface defaults also, if any exist.
1.40 + Array<Method*>* default_methods = InstanceKlass::cast(k)->default_methods();
1.41 + if (default_methods == NULL)
1.42 + return false;
1.43 + m = InstanceKlass::cast(k)->find_method(default_methods, _name, _signature);
1.44 + if (!Dependencies::is_concrete_method(m, NULL))
1.45 + return false;
1.46 + }
1.47 _found_methods[_num_participants] = m;
1.48 // Note: If add_participant(k) is called,
1.49 // the method m will already be memoized for it.
1.50 @@ -1176,15 +1185,17 @@
1.51 return true;
1.52 }
1.53
1.54 -bool Dependencies::is_concrete_method(Method* m) {
1.55 - // Statics are irrelevant to virtual call sites.
1.56 - if (m->is_static()) return false;
1.57 -
1.58 - // We could also return false if m does not yet appear to be
1.59 - // executed, if the VM version supports this distinction also.
1.60 - // Default methods are considered "concrete" as well.
1.61 - return !m->is_abstract() &&
1.62 - !m->is_overpass(); // error functions aren't concrete
1.63 +bool Dependencies::is_concrete_method(Method* m, Klass * k) {
1.64 + // NULL is not a concrete method,
1.65 + // statics are irrelevant to virtual call sites,
1.66 + // abstract methods are not concrete,
1.67 + // overpass (error) methods are not concrete if k is abstract
1.68 + //
1.69 + // note "true" is conservative answer --
1.70 + // overpass clause is false if k == NULL, implies return true if
1.71 + // answer depends on overpass clause.
1.72 + return ! ( m == NULL || m -> is_static() || m -> is_abstract() ||
1.73 + m->is_overpass() && k != NULL && k -> is_abstract() );
1.74 }
1.75
1.76
1.77 @@ -1209,16 +1220,6 @@
1.78 return true;
1.79 }
1.80
1.81 -bool Dependencies::is_concrete_method(ciMethod* m) {
1.82 - // Statics are irrelevant to virtual call sites.
1.83 - if (m->is_static()) return false;
1.84 -
1.85 - // We could also return false if m does not yet appear to be
1.86 - // executed, if the VM version supports this distinction also.
1.87 - return !m->is_abstract();
1.88 -}
1.89 -
1.90 -
1.91 bool Dependencies::has_finalizable_subclass(ciInstanceKlass* k) {
1.92 return k->has_finalizable_subclass();
1.93 }
1.94 @@ -1432,7 +1433,7 @@
1.95 Klass* wit = wf.find_witness_definer(ctxk);
1.96 if (wit != NULL) return NULL; // Too many witnesses.
1.97 Method* fm = wf.found_method(0); // Will be NULL if num_parts == 0.
1.98 - if (Dependencies::is_concrete_method(m)) {
1.99 + if (Dependencies::is_concrete_method(m, ctxk)) {
1.100 if (fm == NULL) {
1.101 // It turns out that m was always the only implementation.
1.102 fm = m;
1.103 @@ -1462,61 +1463,6 @@
1.104 return wf.find_witness_definer(ctxk, changes);
1.105 }
1.106
1.107 -// Find the set of all non-abstract methods under ctxk that match m[0].
1.108 -// (The method m[0] must be defined or inherited in ctxk.)
1.109 -// Include m itself in the set, unless it is abstract.
1.110 -// Fill the given array m[0..(mlen-1)] with this set, and return the length.
1.111 -// (The length may be zero if no concrete methods are found anywhere.)
1.112 -// If there are too many concrete methods to fit in marray, return -1.
1.113 -int Dependencies::find_exclusive_concrete_methods(Klass* ctxk,
1.114 - int mlen,
1.115 - Method* marray[]) {
1.116 - Method* m0 = marray[0];
1.117 - ClassHierarchyWalker wf(m0);
1.118 - assert(wf.check_method_context(ctxk, m0), "proper context");
1.119 - wf.record_witnesses(mlen);
1.120 - bool participants_hide_witnesses = true;
1.121 - Klass* wit = wf.find_witness_definer(ctxk);
1.122 - if (wit != NULL) return -1; // Too many witnesses.
1.123 - int num = wf.num_participants();
1.124 - assert(num <= mlen, "oob");
1.125 - // Keep track of whether m is also part of the result set.
1.126 - int mfill = 0;
1.127 - assert(marray[mfill] == m0, "sanity");
1.128 - if (Dependencies::is_concrete_method(m0))
1.129 - mfill++; // keep m0 as marray[0], the first result
1.130 - for (int i = 0; i < num; i++) {
1.131 - Method* fm = wf.found_method(i);
1.132 - if (fm == m0) continue; // Already put this guy in the list.
1.133 - if (mfill == mlen) {
1.134 - return -1; // Oops. Too many methods after all!
1.135 - }
1.136 - marray[mfill++] = fm;
1.137 - }
1.138 -#ifndef PRODUCT
1.139 - // Make sure the dependency mechanism will pass this discovery:
1.140 - if (VerifyDependencies) {
1.141 - // Turn off dependency tracing while actually testing deps.
1.142 - FlagSetting fs(TraceDependencies, false);
1.143 - switch (mfill) {
1.144 - case 1:
1.145 - guarantee(NULL == (void *)check_unique_concrete_method(ctxk, marray[0]),
1.146 - "verify dep.");
1.147 - break;
1.148 - case 2:
1.149 - guarantee(NULL == (void *)
1.150 - check_exclusive_concrete_methods(ctxk, marray[0], marray[1]),
1.151 - "verify dep.");
1.152 - break;
1.153 - default:
1.154 - ShouldNotReachHere(); // mlen > 2 yet supported
1.155 - }
1.156 - }
1.157 -#endif //PRODUCT
1.158 - return mfill;
1.159 -}
1.160 -
1.161 -
1.162 Klass* Dependencies::check_has_no_finalizable_subclasses(Klass* ctxk, KlassDepChange* changes) {
1.163 Klass* search_at = ctxk;
1.164 if (changes != NULL)
1.165 @@ -1524,7 +1470,6 @@
1.166 return find_finalizable_subclass(search_at);
1.167 }
1.168
1.169 -
1.170 Klass* Dependencies::check_call_site_target_value(oop call_site, oop method_handle, CallSiteDepChange* changes) {
1.171 assert(call_site ->is_a(SystemDictionary::CallSite_klass()), "sanity");
1.172 assert(method_handle->is_a(SystemDictionary::MethodHandle_klass()), "sanity");
