truffle: src/share/vm/code/dependencies.cpp comparison

comparison src/share/vm/code/dependencies.cpp @ 21826:41c3c456e326 jdk8u45-b01

Merge

author	asaha
date	Fri, 12 Dec 2014 14:39:40 -0800
parents	d5b74c583ec1 bee8095780db
children	7622232b7efa

comparison

equal deleted inserted replaced

-:d6a05415f1f4
+:41c3c456e326
 }
 bool is_witness(Klass* k) {
 if (doing_subtype_search()) {
 return Dependencies::is_concrete_klass(k);
+} else if (!k->oop_is_instance()) {
+return false; // no methods to find in an array type
 } else {
 // Search class hierarchy first.
 Method* m = InstanceKlass::cast(k)->find_instance_method(_name, _signature);
 if (!Dependencies::is_concrete_method(m, k)) {
 // Check interface defaults also, if any exist.
 Klass* chains[CHAINMAX];
 int    chaini = 0;  // index into worklist
 Klass* chain;       // scratch variable
 #define ADD_SUBCLASS_CHAIN(k)                     {  \
 assert(chaini < CHAINMAX, "oob");                \
-chain = InstanceKlass::cast(k)->subklass();      \
+chain = k->subklass();                           \
 if (chain != NULL)  chains[chaini++] = chain;    }
 // Look for non-abstract subclasses.
 // (Note:  Interfaces do not have subclasses.)
 ADD_SUBCLASS_CHAIN(context_type);
 // If it is an interface, search its direct implementors.
 // (Their subclasses are additional indirect implementors.
 // See InstanceKlass::add_implementor.)
 // (Note:  nof_implementors is always zero for non-interfaces.)
-int nof_impls = InstanceKlass::cast(context_type)->nof_implementors();
+if (top_level_call) {
-if (nof_impls > 1) {
+int nof_impls = InstanceKlass::cast(context_type)->nof_implementors();
-// Avoid this case: *I.m > { A.m, C }; B.m > C
+if (nof_impls > 1) {
-// Here, I.m has 2 concrete implementations, but m appears unique
+// Avoid this case: *I.m > { A.m, C }; B.m > C
-// as A.m, because the search misses B.m when checking C.
+// Here, I.m has 2 concrete implementations, but m appears unique
-// The inherited method B.m was getting missed by the walker
+// as A.m, because the search misses B.m when checking C.
-// when interface 'I' was the starting point.
+// The inherited method B.m was getting missed by the walker
-// %%% Until this is fixed more systematically, bail out.
+// when interface 'I' was the starting point.
-// (Old CHA had the same limitation.)
+// %%% Until this is fixed more systematically, bail out.
-return context_type;
+// (Old CHA had the same limitation.)
-}
+return context_type;
-if (nof_impls > 0) {
+}
-Klass* impl = InstanceKlass::cast(context_type)->implementor();
+if (nof_impls > 0) {
-assert(impl != NULL, "just checking");
+Klass* impl = InstanceKlass::cast(context_type)->implementor();
-// If impl is the same as the context_type, then more than one
+assert(impl != NULL, "just checking");
-// implementor has seen. No exact info in this case.
+// If impl is the same as the context_type, then more than one
-if (impl == context_type) {
+// implementor has seen. No exact info in this case.
-return context_type;  // report an inexact witness to this sad affair
+if (impl == context_type) {
-}
+return context_type;  // report an inexact witness to this sad affair
-if (do_counts)
+}
-{ NOT_PRODUCT(deps_find_witness_steps++); }
+if (do_counts)
-if (is_participant(impl)) {
+{ NOT_PRODUCT(deps_find_witness_steps++); }
-if (!participants_hide_witnesses) {
+if (is_participant(impl)) {
+if (!participants_hide_witnesses) {
+ADD_SUBCLASS_CHAIN(impl);
+}
+} else if (is_witness(impl) && !ignore_witness(impl)) {
+return impl;
+} else {
 ADD_SUBCLASS_CHAIN(impl);
 }
-} else if (is_witness(impl) && !ignore_witness(impl)) {
-return impl;
-} else {
-ADD_SUBCLASS_CHAIN(impl);
 }
 }
 // Recursively process each non-trivial sibling chain.
 while (chaini > 0) {

Mercurial > hg > truffle

comparison src/share/vm/code/dependencies.cpp @ 21826:41c3c456e326 jdk8u45-b01