Mercurial > hg > graal-compiler
comparison src/share/vm/oops/method.cpp @ 12356:359f7e70ae7f
Reduce HotSpot diff and fix previous merge
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Fri, 11 Oct 2013 15:41:33 +0200 |
parents | cefad50507d8 |
children | 096c224171c4 |
comparison
equal
deleted
inserted
replaced
12355:cefad50507d8 | 12356:359f7e70ae7f |
---|---|
728 } | 728 } |
729 | 729 |
730 bool Method::is_always_compilable() const { | 730 bool Method::is_always_compilable() const { |
731 // Generated adapters must be compiled | 731 // Generated adapters must be compiled |
732 if (is_method_handle_intrinsic()) { | 732 if (is_method_handle_intrinsic()) { |
733 bool is_executeCompiled = intrinsic_id() == vmIntrinsics::_CompilerToVMImpl_executeCompiledMethod); | 733 bool is_executeCompiled = intrinsic_id() == vmIntrinsics::_CompilerToVMImpl_executeCompiledMethod; |
734 if (is_synthetic() || is_executeCompiled) { | 734 if (is_synthetic() || is_executeCompiled) { |
735 assert(!is_not_c1_compilable() || is_executeCompiled, "sanity check"); | 735 assert(!is_not_c1_compilable() || is_executeCompiled, "sanity check"); |
736 assert(!is_not_c2_compilable() || is_executeCompiled, "sanity check"); | 736 assert(!is_not_c2_compilable() || is_executeCompiled, "sanity check"); |
737 return true; | 737 return true; |
738 } | 738 } |
1037 } | 1037 } |
1038 | 1038 |
1039 // Test if this method is an internal MH primitive method. | 1039 // Test if this method is an internal MH primitive method. |
1040 bool Method::is_method_handle_intrinsic() const { | 1040 bool Method::is_method_handle_intrinsic() const { |
1041 vmIntrinsics::ID iid = intrinsic_id(); | 1041 vmIntrinsics::ID iid = intrinsic_id(); |
1042 return ((MethodHandles::is_signature_polymorphic(iid) && | 1042 return (MethodHandles::is_signature_polymorphic(iid) && |
1043 MethodHandles::is_signature_polymorphic_intrinsic(iid))) || iid == vmIntrinsics::_CompilerToVMImpl_executeCompiledMethod; | 1043 MethodHandles::is_signature_polymorphic_intrinsic(iid)) || iid == vmIntrinsics::_CompilerToVMImpl_executeCompiledMethod; |
1044 } | 1044 } |
1045 | 1045 |
1046 bool Method::has_member_arg() const { | 1046 bool Method::has_member_arg() const { |
1047 vmIntrinsics::ID iid = intrinsic_id(); | 1047 vmIntrinsics::ID iid = intrinsic_id(); |
1048 return (MethodHandles::is_signature_polymorphic(iid) && | 1048 return (MethodHandles::is_signature_polymorphic(iid) && |