comparison src/share/vm/ci/ciMethod.cpp @ 17721:d8a0bb6f62a5

Merge
author coffeys
date Wed, 12 Mar 2014 18:53:34 +0000
parents 849eb7bfceac e46f2ee62e78
children 0bf37f737702
comparison
equal deleted inserted replaced
17700:d4e18f0633c6 17721:d8a0bb6f62a5
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,