Mercurial > hg > truffle

comparison src/share/vm/classfile/defaultMethods.cpp @ 12334:268e7a2178d7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author iveresov
date Thu, 03 Oct 2013 16:38:21 +0400
parents 36b97be47bde f2512d89ad0c
children cefad50507d8 ac9cb1d5a202 17cda06bcb7d
comparison
equal deleted inserted replaced
12321:31f0118ea584 12334:268e7a2178d7
791 #endif // ndef PRODUCT 791 #endif // ndef PRODUCT
792 } 792 }
793 793
794 794
795 795
796 #ifndef PRODUCT 796 #ifdef ASSERT
797 // Return true is broad type is a covariant return of narrow type 797 // Return true is broad type is a covariant return of narrow type
798 static bool covariant_return_type(BasicType narrow, BasicType broad) { 798 static bool covariant_return_type(BasicType narrow, BasicType broad) {
799 if (narrow == broad) { 799 if (narrow == broad) {
800 return true; 800 return true;
801 } 801 }
802 if (broad == T_OBJECT) { 802 if (broad == T_OBJECT) {
803 return true; 803 return true;
804 } 804 }
805 return false; 805 return false;
806 } 806 }
807 #endif // ndef PRODUCT 807 #endif
808 808
809 static int assemble_redirect( 809 static int assemble_redirect(
810 BytecodeConstantPool* cp, BytecodeBuffer* buffer, 810 BytecodeConstantPool* cp, BytecodeBuffer* buffer,
811 Symbol* incoming, Method* target, TRAPS) { 811 Symbol* incoming, Method* target, TRAPS) {
812 812
1093 if (original_ordering->length() > 0) { 1093 if (original_ordering->length() > 0) {
1094 klass->set_method_ordering(merged_ordering); 1094 klass->set_method_ordering(merged_ordering);
1095 MetadataFactory::free_array(cld, original_ordering); 1095 MetadataFactory::free_array(cld, original_ordering);
1096 } 1096 }
1097 } 1097 }
1098