Mercurial > hg > graal-compiler
diff 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 |
line wrap: on
line diff
--- a/src/share/vm/oops/method.cpp Fri Oct 11 10:38:03 2013 +0200 +++ b/src/share/vm/oops/method.cpp Fri Oct 11 15:41:33 2013 +0200 @@ -730,7 +730,7 @@ bool Method::is_always_compilable() const { // Generated adapters must be compiled if (is_method_handle_intrinsic()) { - bool is_executeCompiled = intrinsic_id() == vmIntrinsics::_CompilerToVMImpl_executeCompiledMethod); + bool is_executeCompiled = intrinsic_id() == vmIntrinsics::_CompilerToVMImpl_executeCompiledMethod; if (is_synthetic() || is_executeCompiled) { assert(!is_not_c1_compilable() || is_executeCompiled, "sanity check"); assert(!is_not_c2_compilable() || is_executeCompiled, "sanity check"); @@ -1039,8 +1039,8 @@ // Test if this method is an internal MH primitive method. bool Method::is_method_handle_intrinsic() const { vmIntrinsics::ID iid = intrinsic_id(); - return ((MethodHandles::is_signature_polymorphic(iid) && - MethodHandles::is_signature_polymorphic_intrinsic(iid))) || iid == vmIntrinsics::_CompilerToVMImpl_executeCompiledMethod; + return (MethodHandles::is_signature_polymorphic(iid) && + MethodHandles::is_signature_polymorphic_intrinsic(iid)) || iid == vmIntrinsics::_CompilerToVMImpl_executeCompiledMethod; } bool Method::has_member_arg() const {