archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8264051: Remove unused TRAPS parameters from runtime functions

Browse source 
Reviewed-by: iklam, dholmes
This commit is contained in:
Coleen Phillimore 2021-03-24 12:18:57 +00:00
parent 5d7e93c86d
commit bc91596ca1
16 changed files with 35 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/hotspot/share/oops/instanceKlass.cpp
View file

@ -389,19 +389,19 @@ InstanceKlass* InstanceKlass::nest_host(TRAPS) {
// If it has an explicit _nest_host_index or _nest_members, these will be ignored.
// We also know the "host" is a valid nest-host in the same package so we can
// assert some of those facts.
void InstanceKlass::set_nest_host(InstanceKlass* host, TRAPS) {
void InstanceKlass::set_nest_host(InstanceKlass* host) {
assert(is_hidden(), "must be a hidden class");
assert(host != NULL, "NULL nest host specified");
assert(_nest_host == NULL, "current class has resolved nest-host");
assert(nest_host_error(THREAD) == NULL, "unexpected nest host resolution error exists: %s",
nest_host_error(THREAD));
assert(nest_host_error() == NULL, "unexpected nest host resolution error exists: %s",
nest_host_error());
assert((host->_nest_host == NULL && host->_nest_host_index == 0) ||
(host->_nest_host == host), "proposed host is not a valid nest-host");
// Can't assert this as package is not set yet:
// assert(is_same_class_package(host), "proposed host is in wrong package");
if (log_is_enabled(Trace, class, nestmates)) {
ResourceMark rm(THREAD);
ResourceMark rm;
const char* msg = "";
// a hidden class does not expect a statically defined nest-host
if (_nest_host_index > 0) {
@ -452,11 +452,11 @@ bool InstanceKlass::has_nestmate_access_to(InstanceKlass* k, TRAPS) {
return access;
}
const char* InstanceKlass::nest_host_error(TRAPS) {
const char* InstanceKlass::nest_host_error() {
if (_nest_host_index == 0) {
return NULL;
} else {
constantPoolHandle cph(THREAD, constants());
constantPoolHandle cph(Thread::current(), constants());
return SystemDictionary::find_nest_host_error(cph, (int)_nest_host_index);
}
}
@ -3109,7 +3109,7 @@ InstanceKlass* InstanceKlass::compute_enclosing_class(bool* inner_is_member, TRA
return outer_klass;
}
jint InstanceKlass::compute_modifier_flags(TRAPS) const {
jint InstanceKlass::compute_modifier_flags() const {
jint access = access_flags().as_int();
// But check if it happens to be member class.