Skip to content
This repository has been archived by the owner on Sep 2, 2022. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
8278239: vmTestbase/nsk/jvmti/RedefineClasses/StressRedefine failed w… 
…ith EXCEPTION_ACCESS_VIOLATION at 0x000000000000000d

Reviewed-by: kvn, sspitsyn, eosterlund
  • Loading branch information
@coleenp
coleenp committed Dec 22, 2021
1 parent dfb15c3 commit 2be3e7e
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/hotspot/share/code/codeCache.cpp
View file
Expand Up @@ -678,7 +678,7 @@ void CodeCache::nmethods_do(void f(nmethod* nm)) {

void CodeCache::metadata_do(MetadataClosure* f) {
assert_locked_or_safepoint(CodeCache_lock);
NMethodIterator iter(NMethodIterator::only_alive_and_not_unloading);
NMethodIterator iter(NMethodIterator::only_alive);
while(iter.next()) {
iter.method()->metadata_do(f);
}
Expand Down Expand Up @@ -1032,7 +1032,7 @@ CompiledMethod* CodeCache::find_compiled(void* start) {
}

#if INCLUDE_JVMTI
// RedefineClasses support for unloading nmethods that are dependent on "old" methods.
// RedefineClasses support for saving nmethods that are dependent on "old" methods.
// We don't really expect this table to grow very large. If it does, it can become a hashtable.
static GrowableArray<CompiledMethod*>* old_compiled_method_table = NULL;

Expand Down Expand Up @@ -1085,7 +1085,7 @@ int CodeCache::mark_dependents_for_evol_deoptimization() {
reset_old_method_table();

int number_of_marked_CodeBlobs = 0;
CompiledMethodIterator iter(CompiledMethodIterator::only_alive_and_not_unloading);
CompiledMethodIterator iter(CompiledMethodIterator::only_alive);
while(iter.next()) {
CompiledMethod* nm = iter.method();
// Walk all alive nmethods to check for old Methods.
Expand All @@ -1105,7 +1105,7 @@ int CodeCache::mark_dependents_for_evol_deoptimization() {

void CodeCache::mark_all_nmethods_for_evol_deoptimization() {
assert(SafepointSynchronize::is_at_safepoint(), "Can only do this at a safepoint!");
CompiledMethodIterator iter(CompiledMethodIterator::only_alive_and_not_unloading);
CompiledMethodIterator iter(CompiledMethodIterator::only_alive);
while(iter.next()) {
CompiledMethod* nm = iter.method();
if (!nm->method()->is_method_handle_intrinsic()) {
Expand Down

3 comments on commit 2be3e7e

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review

Issues

@GoeLin
Copy link
Member

@GoeLin GoeLin commented on 2be3e7e Jan 4, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 2be3e7e Jan 4, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GoeLin the backport was successfully created on the branch GoeLin-backport-2be3e7ef in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 2be3e7ef from the openjdk/jdk18 repository.

The commit being backported was authored by Coleen Phillimore on 22 Dec 2021 and was reviewed by Vladimir Kozlov, Serguei Spitsyn and Erik Österlund.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:

$ git fetch https://github.com/openjdk-bots/jdk17u-dev GoeLin-backport-2be3e7ef:GoeLin-backport-2be3e7ef
$ git checkout GoeLin-backport-2be3e7ef
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev GoeLin-backport-2be3e7ef

Please sign in to comment.