Mercurial > hg > truffle
comparison src/share/vm/ci/ciMethod.cpp @ 17812:a7d4d4655766
Merge
author | kvn |
---|---|
date | Wed, 26 Mar 2014 18:21:05 -0700 |
parents | d8a0bb6f62a5 |
children | 0bf37f737702 |
comparison
equal
deleted
inserted
replaced
17789:6b207d038106 | 17812:a7d4d4655766 |
---|---|
722 | 722 |
723 if (!UseCHA) return NULL; | 723 if (!UseCHA) return NULL; |
724 | 724 |
725 VM_ENTRY_MARK; | 725 VM_ENTRY_MARK; |
726 | 726 |
727 // Disable CHA for default methods for now | |
728 if (root_m->get_Method()->is_default_method()) { | |
729 return NULL; | |
730 } | |
731 | |
727 methodHandle target; | 732 methodHandle target; |
728 { | 733 { |
729 MutexLocker locker(Compile_lock); | 734 MutexLocker locker(Compile_lock); |
730 Klass* context = actual_recv->get_Klass(); | 735 Klass* context = actual_recv->get_Klass(); |
731 target = Dependencies::find_unique_concrete_method(context, | 736 target = Dependencies::find_unique_concrete_method(context, |