Skip to content
Permalink
Browse files
8266963: Remove safepoint poll introduced in 8262443 due to reentranc…
…e issue

Reviewed-by: rehn, zgu, dholmes
  • Loading branch information
linade authored and David Holmes committed May 26, 2021
1 parent 45e0597 commit 9c346a1ec78b45c61fbfc76961dc5674cfd98520
Showing with 5 additions and 12 deletions.
  1. +4 −11 src/hotspot/share/oops/generateOopMap.cpp
  2. +1 −1 src/hotspot/share/oops/generateOopMap.hpp
@@ -34,7 +34,6 @@
#include "oops/oop.inline.hpp"
#include "oops/symbol.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/interfaceSupport.inline.hpp"
#include "runtime/java.hpp"
#include "runtime/os.hpp"
#include "runtime/relocator.hpp"
@@ -907,18 +906,12 @@ void GenerateOopMap::monitor_push(CellTypeState cts) {
// Interpretation handling methods
//

void GenerateOopMap::do_interpretation(Thread* thread)
void GenerateOopMap::do_interpretation()
{
// "i" is just for debugging, so we can detect cases where this loop is
// iterated more than once.
int i = 0;
do {
if (i != 0 && thread->is_Java_thread()) {
JavaThread* jt = thread->as_Java_thread();
if (jt->thread_state() == _thread_in_vm) {
// Since this JavaThread has looped at least once and is _thread_in_vm,
// we honor any pending blocking request.
ThreadBlockInVM tbivm(jt);
}
}
#ifndef PRODUCT
if (TraceNewOopMapGeneration) {
tty->print("\n\nIteration #%d of do_interpretation loop, method:\n", i);
@@ -2136,7 +2129,7 @@ bool GenerateOopMap::compute_map(Thread* current) {

// Step 3: Calculate stack maps
if (!_got_error)
do_interpretation(current);
do_interpretation();

// Step 4:Return results
if (!_got_error && report_results())
@@ -374,7 +374,7 @@ class GenerateOopMap {
static void reachable_basicblock (GenerateOopMap *c, int deltaBci, int *data);

// Interpretation methods (primary)
void do_interpretation (Thread* thread);
void do_interpretation ();
void init_basic_blocks ();
void setup_method_entry_state ();
void interp_all ();

1 comment on commit 9c346a1

@openjdk-notifier

This comment has been minimized.

Copy link

@openjdk-notifier openjdk-notifier bot commented on 9c346a1 May 26, 2021

Please sign in to comment.