OpenJDK / amber / amber
changeset 55208:1019c97e1bde
8219969: Backout JDK-8219492
Reviewed-by: goetz, hseigel, tschatzl
author | dholmes |
---|---|
date | Fri, 01 Mar 2019 08:14:29 -0500 |
parents | 1ad7c590a6e7 |
children | 43c2ab1bdfd3 |
files | src/hotspot/share/interpreter/interpreterRuntime.cpp src/hotspot/share/oops/cpCache.cpp src/hotspot/share/oops/cpCache.hpp src/hotspot/share/runtime/sharedRuntime.cpp |
diffstat | 4 files changed, 19 insertions(+), 36 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/share/interpreter/interpreterRuntime.cpp Sun Feb 10 09:10:42 2019 +0100 +++ b/src/hotspot/share/interpreter/interpreterRuntime.cpp Fri Mar 01 08:14:29 2019 -0500 @@ -920,23 +920,19 @@ info.call_kind() == CallInfo::vtable_call, ""); } #endif + // Get sender or sender's unsafe_anonymous_host, and only set cpCache entry to resolved if + // it is not an interface. The receiver for invokespecial calls within interface + // methods must be checked for every call. + InstanceKlass* sender = pool->pool_holder(); + sender = sender->is_unsafe_anonymous() ? sender->unsafe_anonymous_host() : sender; switch (info.call_kind()) { - case CallInfo::direct_call: { - // Get sender or sender's unsafe_anonymous_host, and only set cpCache entry to resolved if - // it is not an interface. The receiver for invokespecial calls within interface - // methods must be checked for every call. - InstanceKlass* pool_holder = pool->pool_holder(); - InstanceKlass* sender = pool_holder->is_unsafe_anonymous() ? - pool_holder->unsafe_anonymous_host() : pool_holder; - + case CallInfo::direct_call: cp_cache_entry->set_direct_call( bytecode, info.resolved_method(), - sender->is_interface(), - pool_holder); + sender->is_interface()); break; - } case CallInfo::vtable_call: cp_cache_entry->set_vtable_call( bytecode,
--- a/src/hotspot/share/oops/cpCache.cpp Sun Feb 10 09:10:42 2019 +0100 +++ b/src/hotspot/share/oops/cpCache.cpp Fri Mar 01 08:14:29 2019 -0500 @@ -168,8 +168,7 @@ void ConstantPoolCacheEntry::set_direct_or_vtable_call(Bytecodes::Code invoke_code, const methodHandle& method, int vtable_index, - bool sender_is_interface, - InstanceKlass* pool_holder) { + bool sender_is_interface) { bool is_vtable_call = (vtable_index >= 0); // FIXME: split this method on this boolean assert(method->interpreter_entry() != NULL, "should have been set at this point"); assert(!method->is_obsolete(), "attempt to write obsolete method to cpCache"); @@ -264,17 +263,11 @@ } // Don't mark invokestatic to method as resolved if the holder class has not yet completed // initialization. An invokestatic must only proceed if the class is initialized, but if - // we resolve it before then that class initialization check is skipped. However if the call - // is from the same class we can resolve as we must be executing with <clinit> on our call stack. - if (invoke_code == Bytecodes::_invokestatic && - !method->method_holder()->is_initialized() && - method->method_holder() != pool_holder) { + // we resolve it before then that class initialization check is skipped. + if (invoke_code == Bytecodes::_invokestatic && !method->method_holder()->is_initialized()) { do_resolve = false; } if (do_resolve) { - assert(method->method_holder()->is_initialized() || - method->method_holder()->is_reentrant_initialization(Thread::current()), - "invalid class initalization state"); set_bytecode_1(invoke_code); } } else if (byte_no == 2) { @@ -317,17 +310,17 @@ } void ConstantPoolCacheEntry::set_direct_call(Bytecodes::Code invoke_code, const methodHandle& method, - bool sender_is_interface, InstanceKlass* pool_holder) { + bool sender_is_interface) { int index = Method::nonvirtual_vtable_index; // index < 0; FIXME: inline and customize set_direct_or_vtable_call - set_direct_or_vtable_call(invoke_code, method, index, sender_is_interface, pool_holder); + set_direct_or_vtable_call(invoke_code, method, index, sender_is_interface); } void ConstantPoolCacheEntry::set_vtable_call(Bytecodes::Code invoke_code, const methodHandle& method, int index) { // either the method is a miranda or its holder should accept the given index assert(method->method_holder()->is_interface() || method->method_holder()->verify_vtable_index(index), ""); // index >= 0; FIXME: inline and customize set_direct_or_vtable_call - set_direct_or_vtable_call(invoke_code, method, index, false, NULL /* not used */); + set_direct_or_vtable_call(invoke_code, method, index, false); } void ConstantPoolCacheEntry::set_itable_call(Bytecodes::Code invoke_code,
--- a/src/hotspot/share/oops/cpCache.hpp Sun Feb 10 09:10:42 2019 +0100 +++ b/src/hotspot/share/oops/cpCache.hpp Fri Mar 01 08:14:29 2019 -0500 @@ -230,16 +230,14 @@ Bytecodes::Code invoke_code, // the bytecode used for invoking the method const methodHandle& method, // the method/prototype if any (NULL, otherwise) int vtable_index, // the vtable index if any, else negative - bool sender_is_interface, // 'logical' sender (may be host of VMAC) - InstanceKlass* pool_holder // class from which the call is made + bool sender_is_interface ); public: void set_direct_call( // sets entry to exact concrete method entry Bytecodes::Code invoke_code, // the bytecode used for invoking the method const methodHandle& method, // the method to call - bool sender_is_interface, // 'logical' sender (may be host of VMAC) - InstanceKlass* pool_holder // class from which the call is made + bool sender_is_interface ); void set_vtable_call( // sets entry to vtable index
--- a/src/hotspot/share/runtime/sharedRuntime.cpp Sun Feb 10 09:10:42 2019 +0100 +++ b/src/hotspot/share/runtime/sharedRuntime.cpp Fri Mar 01 08:14:29 2019 -0500 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -1376,17 +1376,13 @@ } #endif - // Do not patch call site for static call to another class - // when the class is not fully initialized. + // Do not patch call site for static call when the class is not + // fully initialized. if (invoke_code == Bytecodes::_invokestatic && - !callee_method->method_holder()->is_initialized() && - callee_method->method_holder() != caller_nm->method()->method_holder()) { + !callee_method->method_holder()->is_initialized()) { assert(callee_method->method_holder()->is_linked(), "must be"); return callee_method; } - assert(callee_method->method_holder()->is_initialized() || - callee_method->method_holder()->is_reentrant_initialization(thread), - "invalid class initalization state"); // JSR 292 key invariant: // If the resolved method is a MethodHandle invoke target, the call