Skip to content

Commit 8861b62

Browse files
coleenpcoleenp
committedJan 20, 2022
Add ResourceMarks
·
JEP-429-branchpoint
1 parent 854a81a commit 8861b62

14 files changed

+108
-119
lines changed
 

‎src/hotspot/cpu/aarch64/frame_aarch64.inline.hpp

+8-15
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
33
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -58,7 +58,7 @@ inline void frame::init(intptr_t* sp, intptr_t* fp, address pc) {
5858
_pc = pc;
5959
assert(pc != NULL, "no pc?");
6060
_cb = CodeCache::find_blob(pc);
61-
61+
6262
setup(pc);
6363

6464
_oop_map = NULL;
@@ -143,7 +143,7 @@ inline frame::frame(intptr_t* sp, intptr_t* unextended_sp, intptr_t* fp, address
143143
_cb = CodeCache::find_blob_fast(pc);
144144
_oop_map = NULL;
145145
assert(_cb != NULL, "pc: " INTPTR_FORMAT " sp: " INTPTR_FORMAT " unextended_sp: " INTPTR_FORMAT " fp: " INTPTR_FORMAT, p2i(pc), p2i(sp), p2i(unextended_sp), p2i(fp));
146-
146+
147147
setup(pc);
148148
}
149149

@@ -250,13 +250,6 @@ inline void frame::interpreted_frame_oop_map(InterpreterOopMap* mask) const {
250250
m->mask_for(bci, mask); // OopMapCache::compute_one_oop_map(m, bci, mask);
251251
}
252252

253-
254-
inline int frame::interpreted_frame_num_oops(InterpreterOopMap* mask) const {
255-
return mask->num_oops()
256-
+ 1 // for the mirror oop
257-
+ ((intptr_t*)interpreter_frame_monitor_begin() - (intptr_t*)interpreter_frame_monitor_end())/BasicObjectLock::size();
258-
}
259-
260253
// helper to update a map with callee-saved RBP
261254

262255
template <typename RegisterMapT>
@@ -461,7 +454,7 @@ frame frame::sender_for_compiled_frame(RegisterMap* map) const {
461454
// outside of update_register_map.
462455
if (stub) { // compiled frames do not use callee-saved registers
463456
map->set_include_argument_oops(_cb->caller_must_gc_arguments(map->thread()));
464-
if (oop_map() != NULL) {
457+
if (oop_map() != NULL) {
465458
_oop_map->update_register_map(this, map);
466459
}
467460
} else {
@@ -476,11 +469,11 @@ frame frame::sender_for_compiled_frame(RegisterMap* map) const {
476469
update_map_with_saved_link(map, saved_fp_addr);
477470
}
478471

479-
if (Continuation::is_return_barrier_entry(sender_pc)) {
480-
if (map->walk_cont()) { // about to walk into an h-stack
481-
return Continuation::top_frame(*this, map);
472+
if (Continuation::is_return_barrier_entry(sender_pc)) {
473+
if (map->walk_cont()) { // about to walk into an h-stack
474+
return Continuation::top_frame(*this, map);
482475
} else {
483-
Continuation::fix_continuation_bottom_sender(map->thread(), *this, &sender_pc, &sender_sp);
476+
Continuation::fix_continuation_bottom_sender(map->thread(), *this, &sender_pc, &sender_sp);
484477
}
485478
}
486479

‎src/hotspot/cpu/aarch64/instanceStackChunkKlass_aarch64.inline.hpp

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -110,9 +110,9 @@ inline int StackChunkFrameStream<mixed>::interpreter_frame_size() const {
110110
// InterpreterOopMap mask;
111111
// to_frame().interpreted_frame_oop_map(&mask);
112112
// intptr_t* top = derelativize(frame::interpreter_frame_initial_sp_offset) - mask.expression_stack_size();
113-
113+
114114
intptr_t* top = unextended_sp(); // later subtract argsize if callee is interpreted
115-
intptr_t* bottom = derelativize(frame::interpreter_frame_locals_offset) + 1; // the sender's unextended sp: derelativize(frame::interpreter_frame_sender_sp_offset);
115+
intptr_t* bottom = derelativize(frame::interpreter_frame_locals_offset) + 1; // the sender's unextended sp: derelativize(frame::interpreter_frame_sender_sp_offset);
116116

117117
// tty->print_cr(">>>> StackChunkFrameStream<mixed>::interpreter_frame_size bottom: %d top: %d size: %d", _chunk->to_offset(bottom - 1) + 1, _chunk->to_offset(top), (int)(bottom - top));
118118
return (int)(bottom - top);
@@ -129,6 +129,7 @@ inline int StackChunkFrameStream<mixed>::interpreter_frame_stack_argsize() const
129129
template <bool mixed>
130130
inline int StackChunkFrameStream<mixed>::interpreter_frame_num_oops() const {
131131
assert (mixed && is_interpreted(), "");
132+
ResourceMark rm;
132133
InterpreterOopMap mask;
133134
frame f = to_frame();
134135
f.interpreted_frame_oop_map(&mask);
@@ -184,7 +185,7 @@ class SmallRegisterMap {
184185
frame::update_map_with_saved_link(map, (intptr_t**)sp - frame::sender_sp_offset);
185186
return map;
186187
}
187-
188+
188189
SmallRegisterMap() {}
189190

190191
SmallRegisterMap(const RegisterMap* map) {
@@ -205,7 +206,7 @@ class SmallRegisterMap {
205206

206207
JavaThread* thread() const {
207208
#ifndef ASSERT
208-
guarantee (false, "");
209+
guarantee (false, "");
209210
#endif
210211
return nullptr;
211212
}
@@ -216,7 +217,7 @@ class SmallRegisterMap {
216217
void set_include_argument_oops(bool f) {}
217218
bool in_cont() const { return false; }
218219
stackChunkHandle stack_chunk() const { return stackChunkHandle(); }
219-
220+
220221
#ifdef ASSERT
221222
bool should_skip_missing() const { return false; }
222223
VMReg find_register_spilled_here(void* p, intptr_t* sp) { return rfp->as_VMReg(); }

‎src/hotspot/cpu/arm/frame_arm.inline.hpp

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -246,11 +246,6 @@ inline void frame::interpreted_frame_oop_map(InterpreterOopMap* mask) const {
246246
Unimplemented();
247247
}
248248

249-
inline int frame::interpreted_frame_num_oops(InterpreterOopMap* mask) const {
250-
Unimplemented();
251-
return 0;
252-
}
253-
254249
template <bool relative>
255250
inline intptr_t* frame::interpreter_frame_last_sp() const {
256251
Unimplemented();

‎src/hotspot/cpu/ppc/frame_ppc.inline.hpp

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
33
* Copyright (c) 2012, 2015 SAP SE. All rights reserved.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -228,11 +228,6 @@ inline void frame::interpreted_frame_oop_map(InterpreterOopMap* mask) const {
228228
Unimplemented();
229229
}
230230

231-
inline int frame::interpreted_frame_num_oops(InterpreterOopMap* mask) const {
232-
Unimplemented();
233-
return 0;
234-
}
235-
236231
template <bool relative>
237232
inline intptr_t* frame::interpreter_frame_last_sp() const {
238233
Unimplemented();

‎src/hotspot/cpu/s390/frame_s390.inline.hpp

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
33
* Copyright (c) 2016 SAP SE. All rights reserved.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -295,11 +295,6 @@ inline void frame::interpreted_frame_oop_map(InterpreterOopMap* mask) const {
295295
Unimplemented();
296296
}
297297

298-
inline int frame::interpreted_frame_num_oops(InterpreterOopMap* mask) const {
299-
Unimplemented();
300-
return 0;
301-
}
302-
303298
template <bool relative>
304299
inline intptr_t* frame::interpreter_frame_last_sp() const {
305300
Unimplemented();

‎src/hotspot/cpu/x86/frame_x86.inline.hpp

+7-14
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -54,7 +54,7 @@ inline void frame::init(intptr_t* sp, intptr_t* fp, address pc) {
5454
_pc = pc;
5555
assert(pc != NULL, "no pc?");
5656
_cb = CodeCache::find_blob(pc); // not fast because this constructor can be used on native frames
57-
57+
5858
setup(pc);
5959

6060
_oop_map = NULL;
@@ -241,13 +241,6 @@ inline void frame::interpreted_frame_oop_map(InterpreterOopMap* mask) const {
241241
m->mask_for(bci, mask); // OopMapCache::compute_one_oop_map(m, bci, mask);
242242
}
243243

244-
245-
inline int frame::interpreted_frame_num_oops(InterpreterOopMap* mask) const {
246-
return mask->num_oops()
247-
+ 1 // for the mirror oop
248-
+ ((intptr_t*)interpreter_frame_monitor_begin() - (intptr_t*)interpreter_frame_monitor_end())/BasicObjectLock::size();
249-
}
250-
251244
// helper to update a map with callee-saved RBP
252245

253246
template <typename RegisterMapT>
@@ -453,7 +446,7 @@ frame frame::sender_for_compiled_frame(RegisterMap* map) const {
453446
// outside of update_register_map.
454447
if (stub) { // compiled frames do not use callee-saved registers
455448
map->set_include_argument_oops(_cb->caller_must_gc_arguments(map->thread()));
456-
if (oop_map() != NULL) {
449+
if (oop_map() != NULL) {
457450
_oop_map->update_register_map(this, map);
458451
}
459452
} else {
@@ -470,11 +463,11 @@ frame frame::sender_for_compiled_frame(RegisterMap* map) const {
470463

471464
assert(sender_sp != sp(), "must have changed");
472465

473-
if (Continuation::is_return_barrier_entry(sender_pc)) {
474-
if (map->walk_cont()) { // about to walk into an h-stack
475-
return Continuation::top_frame(*this, map);
466+
if (Continuation::is_return_barrier_entry(sender_pc)) {
467+
if (map->walk_cont()) { // about to walk into an h-stack
468+
return Continuation::top_frame(*this, map);
476469
} else {
477-
Continuation::fix_continuation_bottom_sender(map->thread(), *this, &sender_pc, &sender_sp);
470+
Continuation::fix_continuation_bottom_sender(map->thread(), *this, &sender_pc, &sender_sp);
478471
}
479472
}
480473

‎src/hotspot/cpu/x86/instanceStackChunkKlass_x86.inline.hpp

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -110,9 +110,9 @@ inline int StackChunkFrameStream<mixed>::interpreter_frame_size() const {
110110
// InterpreterOopMap mask;
111111
// to_frame().interpreted_frame_oop_map(&mask);
112112
// intptr_t* top = derelativize(frame::interpreter_frame_initial_sp_offset) - mask.expression_stack_size();
113-
113+
114114
intptr_t* top = unextended_sp(); // later subtract argsize if callee is interpreted
115-
intptr_t* bottom = derelativize(frame::interpreter_frame_locals_offset) + 1; // the sender's unextended sp: derelativize(frame::interpreter_frame_sender_sp_offset);
115+
intptr_t* bottom = derelativize(frame::interpreter_frame_locals_offset) + 1; // the sender's unextended sp: derelativize(frame::interpreter_frame_sender_sp_offset);
116116

117117
// tty->print_cr(">>>> StackChunkFrameStream<mixed>::interpreter_frame_size bottom: %d top: %d size: %d", _chunk->to_offset(bottom - 1) + 1, _chunk->to_offset(top), (int)(bottom - top));
118118
return (int)(bottom - top);
@@ -129,6 +129,7 @@ inline int StackChunkFrameStream<mixed>::interpreter_frame_stack_argsize() const
129129
template <bool mixed>
130130
inline int StackChunkFrameStream<mixed>::interpreter_frame_num_oops() const {
131131
assert (mixed && is_interpreted(), "");
132+
ResourceMark rm;
132133
InterpreterOopMap mask;
133134
frame f = to_frame();
134135
f.interpreted_frame_oop_map(&mask);
@@ -184,7 +185,7 @@ class SmallRegisterMap {
184185
frame::update_map_with_saved_link(map, (intptr_t**)sp - frame::sender_sp_offset);
185186
return map;
186187
}
187-
188+
188189
SmallRegisterMap() {}
189190

190191
SmallRegisterMap(const RegisterMap* map) {
@@ -205,7 +206,7 @@ class SmallRegisterMap {
205206

206207
JavaThread* thread() const {
207208
#ifndef ASSERT
208-
guarantee (false, "");
209+
guarantee (false, "");
209210
#endif
210211
return nullptr;
211212
}

‎src/hotspot/cpu/zero/frame_zero.inline.hpp

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
33
* Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -183,11 +183,6 @@ inline void frame::interpreted_frame_oop_map(InterpreterOopMap* mask) const {
183183
Unimplemented();
184184
}
185185

186-
inline int frame::interpreted_frame_num_oops(InterpreterOopMap* mask) const {
187-
Unimplemented();
188-
return 0;
189-
}
190-
191186
template <bool relative>
192187
inline intptr_t* frame::interpreter_frame_last_sp() const {
193188
Unimplemented();

‎src/hotspot/share/oops/instanceStackChunkKlass.cpp

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -671,6 +671,7 @@ class BuildBitmapStackClosure {
671671
}
672672

673673
if (UseChunkBitmaps) {
674+
// ResourceMark rm;
674675
BuildBitmapOopClosure<compressedOops> oops_closure(_chunk->start_address(), _chunk->bit_offset(), _chunk->bitmap());
675676
f.iterate_oops(&oops_closure, map);
676677
}
@@ -726,6 +727,7 @@ void InstanceStackChunkKlass::fix_thawed_frame(stackChunkOop chunk, const frame&
726727
if (chunk->has_bitmap() && UseCompressedOops) {
727728
FixCompressedOopClosure oop_closure;
728729
if (f.is_interpreted_frame()) {
730+
ResourceMark rm;
729731
f.oops_interpreted_do(&oop_closure, nullptr);
730732
} else {
731733
OopMapDo<OopClosure, DerelativizeDerivedPointers, SkipNullValue> visitor(&oop_closure, nullptr);
@@ -755,7 +757,7 @@ class StackChunkVerifyBitmapClosure : public BitMapClosure {
755757
_count++;
756758

757759
log_develop_trace(jvmcont)("debug_verify_stack_chunk bitmap p: " INTPTR_FORMAT " i: " SIZE_FORMAT, p2i(p), index);
758-
760+
759761
if (!SafepointSynchronize::is_at_safepoint()) {
760762
oop obj = safe_load(p);
761763
assert (obj == nullptr || is_good_oop(obj),
@@ -875,6 +877,7 @@ class VerifyStackClosure {
875877
// }
876878
// }
877879

880+
ResourceMark rm;
878881
StackChunkVerifyOopsClosure oops_closure(_chunk, f.sp());
879882
f.iterate_oops(&oops_closure, map);
880883
assert (oops_closure.count() == num_oops, "oops: %d oopmap->num_oops(): %d", oops_closure.count(), num_oops);
@@ -941,7 +944,7 @@ bool InstanceStackChunkKlass::verify(oop obj, size_t* out_size, int* out_oops, i
941944
if (closure._cb != nullptr && closure._cb->is_compiled()) {
942945
assert (chunk->argsize() == (closure._cb->as_compiled_method()->method()->num_stack_arg_slots() * VMRegImpl::stack_slot_size) >> LogBytesPerWord,
943946
"chunk argsize: %d bottom frame argsize: %d", chunk->argsize(), (closure._cb->as_compiled_method()->method()->num_stack_arg_slots() * VMRegImpl::stack_slot_size) >> LogBytesPerWord);
944-
}
947+
}
945948

946949
assert (closure._num_interpreted_frames == 0 || chunk->has_mixed_frames(), "");
947950

‎src/hotspot/share/oops/instanceStackChunkKlass.inline.hpp

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
1+
/* Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
22
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
33
*
44
* This code is free software; you can redistribute it and/or modify it
@@ -129,7 +129,7 @@ StackChunkFrameStream<mixed>::StackChunkFrameStream(stackChunkOop chunk, bool gc
129129
// }
130130
}
131131
DEBUG_ONLY(else _unextended_sp = nullptr;)
132-
132+
133133
if (is_stub()) {
134134
get_oopmap(pc(), 0);
135135
DEBUG_ONLY(_has_stub = true);
@@ -142,7 +142,7 @@ StackChunkFrameStream<mixed>::StackChunkFrameStream(stackChunkOop chunk, const f
142142
assert (mixed || !chunk->has_mixed_frames(), "");
143143

144144
DEBUG_ONLY(_index = 0;)
145-
145+
146146
_end = chunk->bottom_address();
147147

148148
assert (chunk->is_in_chunk(f.sp()), "");
@@ -178,13 +178,13 @@ inline bool StackChunkFrameStream<mixed>::is_compiled() const {
178178
}
179179

180180
template <bool mixed>
181-
inline bool StackChunkFrameStream<mixed>::is_interpreted() const {
182-
return mixed ? (!is_done() && Interpreter::contains(pc())) : false;
181+
inline bool StackChunkFrameStream<mixed>::is_interpreted() const {
182+
return mixed ? (!is_done() && Interpreter::contains(pc())) : false;
183183
}
184184

185185
template <bool mixed>
186186
inline int StackChunkFrameStream<mixed>::frame_size() const {
187-
return is_interpreted() ? interpreter_frame_size()
187+
return is_interpreted() ? interpreter_frame_size()
188188
: cb()->frame_size() + stack_argsize();
189189
}
190190

@@ -247,26 +247,26 @@ inline void StackChunkFrameStream<mixed>::get_cb() {
247247
return;
248248
}
249249

250-
assert (pc() != nullptr && dbg_is_safe(pc(), -1),
251-
"index: %d sp: " INTPTR_FORMAT " sp offset: %d end offset: %d size: %d chunk sp: %d",
250+
assert (pc() != nullptr && dbg_is_safe(pc(), -1),
251+
"index: %d sp: " INTPTR_FORMAT " sp offset: %d end offset: %d size: %d chunk sp: %d",
252252
_index, p2i(sp()), _chunk->to_offset(sp()), _chunk->to_offset(_chunk->bottom_address()), _chunk->stack_size(), _chunk->sp());
253253

254254
_cb = CodeCache::find_blob_fast(pc());
255255

256256
// if (_cb == nullptr) { tty->print_cr("OOPS"); os::print_location(tty, (intptr_t)pc()); }
257-
assert (_cb != nullptr,
258-
"index: %d sp: " INTPTR_FORMAT " sp offset: %d end offset: %d size: %d chunk sp: %d gc_flag: %d",
257+
assert (_cb != nullptr,
258+
"index: %d sp: " INTPTR_FORMAT " sp offset: %d end offset: %d size: %d chunk sp: %d gc_flag: %d",
259259
_index, p2i(sp()), _chunk->to_offset(sp()), _chunk->to_offset(_chunk->bottom_address()), _chunk->stack_size(), _chunk->sp(), _chunk->is_gc_mode());
260-
assert (is_interpreted() || ((is_stub() || is_compiled()) && _cb->frame_size() > 0),
261-
"index: %d sp: " INTPTR_FORMAT " sp offset: %d end offset: %d size: %d chunk sp: %d is_stub: %d is_compiled: %d frame_size: %d mixed: %d",
260+
assert (is_interpreted() || ((is_stub() || is_compiled()) && _cb->frame_size() > 0),
261+
"index: %d sp: " INTPTR_FORMAT " sp offset: %d end offset: %d size: %d chunk sp: %d is_stub: %d is_compiled: %d frame_size: %d mixed: %d",
262262
_index, p2i(sp()), _chunk->to_offset(sp()), _chunk->to_offset(_chunk->bottom_address()), _chunk->stack_size(), _chunk->sp(), is_stub(), is_compiled(), _cb->frame_size(), mixed);
263263
}
264264

265265
template <bool mixed>
266266
inline void StackChunkFrameStream<mixed>::get_oopmap() const {
267267
if (is_interpreted()) return;
268268
assert (is_compiled(), "");
269-
get_oopmap(pc(), CodeCache::find_oopmap_slot_fast(pc()));
269+
get_oopmap(pc(), CodeCache::find_oopmap_slot_fast(pc()));
270270
}
271271

272272
template <bool mixed>
@@ -416,12 +416,12 @@ template<bool mixed>
416416
template <class DerivedOopClosureType, class RegisterMapT>
417417
inline void StackChunkFrameStream<mixed>::iterate_derived_pointers(DerivedOopClosureType* closure, const RegisterMapT* map) const {
418418
if (is_interpreted()) return;
419-
419+
420420
for (OopMapStream oms(oopmap()); !oms.is_done(); oms.next()) {
421421
OopMapValue omv = oms.current();
422422
if (omv.type() != OopMapValue::derived_oop_value)
423423
continue;
424-
424+
425425
intptr_t* derived_loc = (intptr_t*)reg_to_loc(omv.reg(), map);
426426
intptr_t* base_loc = (intptr_t*)reg_to_loc(omv.content_reg(), map); // see OopMapDo<OopMapFnT, DerivedOopFnT, ValueFilterT>::walk_derived_pointers1
427427

@@ -430,7 +430,7 @@ inline void StackChunkFrameStream<mixed>::iterate_derived_pointers(DerivedOopClo
430430
assert (derived_loc != base_loc, "Base and derived in same location");
431431
assert (is_in_oops(base_loc, map), "not found: " INTPTR_FORMAT, p2i(base_loc));
432432
assert (!is_in_oops(derived_loc, map), "found: " INTPTR_FORMAT, p2i(derived_loc));
433-
433+
434434
Devirtualizer::do_derived_oop(closure, (oop*)base_loc, (derived_pointer*)derived_loc);
435435
}
436436
OrderAccess::storestore(); // to preserve that we set the offset *before* fixing the base oop
@@ -610,7 +610,7 @@ inline void InstanceStackChunkKlass::iterate_stack(stackChunkOop obj, StackChunk
610610

611611
RegisterMap full_map((JavaThread*)nullptr, true, false, true);
612612
full_map.set_include_argument_oops(false);
613-
613+
614614
f.next(&full_map);
615615

616616
// log_develop_trace(jvmcont)("stackChunkOopDesc::iterate_stack this: " INTPTR_FORMAT " safepoint yield caller frame: %d", p2i(this), f.index());

‎src/hotspot/share/runtime/continuation.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ ContMirror::ContMirror(const RegisterMap* map)
361361
#endif
362362
{
363363
assert(_cont != nullptr && oopDesc::is_oop_or_null(_cont), "Invalid cont: " INTPTR_FORMAT, p2i((void*)_cont));
364-
assert (_entry == nullptr || _cont == _entry->cont_oop(), "mirror: " INTPTR_FORMAT " entry: " INTPTR_FORMAT " entry_sp: " INTPTR_FORMAT,
364+
assert (_entry == nullptr || _cont == _entry->cont_oop(), "mirror: " INTPTR_FORMAT " entry: " INTPTR_FORMAT " entry_sp: " INTPTR_FORMAT,
365365
p2i( (oopDesc*)_cont), p2i((oopDesc*)_entry->cont_oop()), p2i(entrySP()));
366366
read();
367367
}
@@ -2194,6 +2194,7 @@ class Thaw {
21942194
NOINLINE void recurse_thaw_interpreted_frame(const frame& hf, frame& caller, int num_frames) {
21952195
assert (hf.is_interpreted_frame(), "");
21962196

2197+
ResourceMark rm; // oops_interpreted_do require ResourceMark
21972198
const bool bottom = recurse_thaw_java_frame<Interpreted>(caller, num_frames);
21982199

21992200
DEBUG_ONLY(before_thaw_java_frame(hf, caller, bottom, num_frames);)
@@ -2832,7 +2833,7 @@ bool Continuation::unpin(JavaThread* current) {
28322833
oop cont = ce->cont_oop();
28332834
assert (cont != nullptr, "");
28342835
assert (cont == ContinuationHelper::get_continuation(current), "");
2835-
2836+
28362837
jshort value = jdk_internal_vm_Continuation::critical_section(cont);
28372838
if (value > 0) {
28382839
jdk_internal_vm_Continuation::set_critical_section(cont, value - 1);

‎src/hotspot/share/runtime/frame.cpp

+45-20
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -105,7 +105,7 @@ RegisterMap::RegisterMap(const RegisterMap* map) {
105105
DEBUG_ONLY(_skip_missing = map->_skip_missing;)
106106

107107
// only the original RegisterMap's handle lives long enough for StackWalker; this is bound to cause trouble with nested continuations.
108-
_chunk = map->_chunk; // stackChunkHandle(Thread::current(), map->_chunk(), map->_chunk.not_null()); //
108+
_chunk = map->_chunk; // stackChunkHandle(Thread::current(), map->_chunk(), map->_chunk.not_null()); //
109109

110110
pd_initialize_from(map);
111111
if (update_map()) {
@@ -911,17 +911,18 @@ oop frame::interpreter_callee_receiver(Symbol* signature) {
911911

912912
template <bool relative>
913913
void frame::oops_interpreted_do(OopClosure* f, const RegisterMap* map, bool query_oop_map_cache) const {
914-
Thread *thread = Thread::current();
915-
methodHandle m (thread, interpreter_frame_method());
914+
Thread* current = Thread::current();
915+
methodHandle m(current, interpreter_frame_method());
916916
jint bci = interpreter_frame_bci();
917917

918+
ResourceMark rm;
918919
InterpreterOopMap mask;
919920
if (query_oop_map_cache) {
920921
m->mask_for(bci, &mask);
921922
} else {
922923
OopMapCache::compute_one_oop_map(m, bci, &mask);
923924
}
924-
925+
925926
oops_interpreted_do0<relative>(f, map, m, bci, mask);
926927
}
927928

@@ -1178,8 +1179,8 @@ bool frame::is_deoptimized_frame() const {
11781179
}
11791180

11801181
/* This method only checks if the frame is deoptimized
1181-
* as in return address being patched.
1182-
* It doesn't care if the OP that we return to is a
1182+
* as in return address being patched.
1183+
* It doesn't care if the OP that we return to is a
11831184
* deopt instruction */
11841185
/*if (_cb != NULL && _cb->is_nmethod()) {
11851186
return NativeDeoptInstruction::is_deopt_at(_pc);
@@ -1294,18 +1295,40 @@ extern "C" bool dbg_is_safe(const void* p, intptr_t errvalue);
12941295

12951296
class FrameValuesOopClosure: public OopClosure, public DerivedOopClosure {
12961297
private:
1297-
FrameValues& _values;
1298-
int _frame_no;
1298+
GrowableArray<oop*>* _oops;
1299+
GrowableArray<narrowOop*>* _narrow_oops;
1300+
NoSafepointVerifier nsv;
12991301
public:
1300-
FrameValuesOopClosure(FrameValues& values, int frame_no) : _values(values), _frame_no(frame_no) {}
1301-
virtual void do_oop(oop* p) {
1302-
bool good = *p == nullptr || (dbg_is_safe(*p, -1) && dbg_is_safe((*p)->klass(), -1) && oopDesc::is_oop_or_null(*p));
1303-
_values.describe(_frame_no, (intptr_t*)p, err_msg("oop%s for #%d", good ? "" : " (BAD)", _frame_no));
1302+
FrameValuesOopClosure() {
1303+
_oops = new (ResourceObj::C_HEAP, mtThread) GrowableArray<oop*>(100, mtThread);
1304+
_narrow_oops = new (ResourceObj::C_HEAP, mtThread) GrowableArray<narrowOop*>(100, mtThread);
1305+
}
1306+
~FrameValuesOopClosure() {
1307+
delete _oops;
1308+
delete _narrow_oops;
13041309
}
1305-
virtual void do_oop(narrowOop* p) { _values.describe(_frame_no, (intptr_t*)p, err_msg("narrow oop for #%d", _frame_no)); }
1306-
virtual void do_derived_oop(oop* base, derived_pointer* derived) {
1310+
void describe(FrameValues& values, int frame_no) {
1311+
for (int i = 0; i < _oops->length(); i++) {
1312+
oop* p = _oops->at(i);
1313+
bool good = *p == nullptr || (dbg_is_safe(*p, -1) && dbg_is_safe((*p)->klass(), -1) && oopDesc::is_oop_or_null(*p));
1314+
values.describe(frame_no, (intptr_t*)p, err_msg("oop%s for #%d", good ? "" : " (BAD)", frame_no));
1315+
}
1316+
for (int i = 0; i < _narrow_oops->length(); i++) {
1317+
narrowOop* p = _narrow_oops->at(i);
1318+
values.describe(frame_no, (intptr_t*)p, err_msg("narrow oop for #%d", frame_no));
1319+
}
1320+
}
1321+
#if 0
1322+
virtual void do_derived_oop(oop* base, derived_pointer* derived) {
13071323
_values.describe(_frame_no, (intptr_t*)derived, err_msg("derived pointer (base: " INTPTR_FORMAT ") for #%d", p2i(base), _frame_no));
13081324
}
1325+
#endif
1326+
virtual void do_oop(oop* p) { _oops->push(p); }
1327+
virtual void do_oop(narrowOop* p) { _narrow_oops->push(p); }
1328+
virtual void do_derived_oop(oop* base, derived_pointer* derived) {
1329+
ShouldNotReachHere(); // ???
1330+
// _values.describe(_frame_no, (intptr_t*)derived, err_msg("derived pointer (base: " INTPTR_FORMAT ") for #%d", p2i(base), _frame_no));
1331+
}
13091332
};
13101333

13111334
class FrameValuesOopMapClosure: public OopMapClosure {
@@ -1369,7 +1392,7 @@ void frame::describe(FrameValues& values, int frame_no, const RegisterMap* reg_m
13691392
values.describe(-1, info_address,
13701393
FormatBuffer<1024>("#%d method %s @ %d", frame_no, m->name_and_sig_as_C_string(), bci), 3);
13711394
if (desc != NULL) {
1372-
values.describe(-1, info_address, err_msg("- %s codelet: %s",
1395+
values.describe(-1, info_address, err_msg("- %s codelet: %s",
13731396
desc->bytecode() >= 0 ? Bytecodes::name(desc->bytecode()) : "",
13741397
desc->description() != NULL ? desc->description() : "?"), 2);
13751398
}
@@ -1408,8 +1431,9 @@ void frame::describe(FrameValues& values, int frame_no, const RegisterMap* reg_m
14081431
}
14091432

14101433
if (reg_map != NULL) {
1411-
FrameValuesOopClosure oopsFn(values, frame_no);
1434+
FrameValuesOopClosure oopsFn;
14121435
oops_do(&oopsFn, NULL, &oopsFn, reg_map);
1436+
oopsFn.describe(values, frame_no);
14131437
}
14141438
} else if (is_entry_frame()) {
14151439
// For now just label the frame
@@ -1497,8 +1521,9 @@ void frame::describe(FrameValues& values, int frame_no, const RegisterMap* reg_m
14971521
}
14981522
}
14991523

1500-
FrameValuesOopClosure oopsFn(values, frame_no);
1524+
FrameValuesOopClosure oopsFn;
15011525
oops_do(&oopsFn, NULL, &oopsFn, reg_map);
1526+
oopsFn.describe(values, frame_no);
15021527

15031528
if (oop_map() != NULL) {
15041529
FrameValuesOopMapClosure valuesFn(this, reg_map, values, frame_no);
@@ -1603,7 +1628,7 @@ void FrameValues::print_on(JavaThread* thread, outputStream* st) {
16031628
while (!thread->is_in_full_stack((address)v1)) v1 = _values.at(--max_index).location;
16041629
}
16051630
}
1606-
1631+
16071632
print_on(st, min_index, max_index, v0, v1);
16081633
}
16091634

@@ -1641,7 +1666,7 @@ void FrameValues::print_on(outputStream* st, int min_index, int max_index, intpt
16411666
st->print_cr(" %s %s %s", spacer, spacer, fv.description);
16421667
} else {
16431668
if (relative
1644-
&& *fv.location != 0 && *fv.location > -100 && *fv.location < 100
1669+
&& *fv.location != 0 && *fv.location > -100 && *fv.location < 100
16451670
&& (strncmp(fv.description, "interpreter_frame_", 18) == 0 || strstr(fv.description, " method "))) {
16461671
st->print_cr(" " INTPTR_FORMAT ": %18d %s", p2i(fv.location), (int)*fv.location, fv.description);
16471672
} else {

‎src/hotspot/share/runtime/frame.hpp

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -199,9 +199,6 @@ class frame {
199199

200200
inline void interpreted_frame_oop_map(InterpreterOopMap* mask) const;
201201

202-
// the number of oops in the frame
203-
inline int interpreted_frame_num_oops(InterpreterOopMap* mask) const;
204-
205202
// returns the sending frame
206203
frame sender(RegisterMap* map) const;
207204

@@ -235,7 +232,7 @@ class frame {
235232
intptr_t at(int index) const { return *addr_at(index); }
236233
// in interpreter frames in continuation stacks, internal addresses are relative to fp.
237234
intptr_t at_relative(int index) const { return (intptr_t)(fp() + fp()[index]); }
238-
template <bool relative>
235+
template <bool relative>
239236
intptr_t at(int index) const { return relative ? at_relative(index) : at(index); }
240237

241238
// accessors for locals
@@ -364,7 +361,7 @@ class frame {
364361
// this value is >= BasicObjectLock::size(), and may be rounded up
365362

366363
BasicObjectLock* interpreter_frame_monitor_begin() const;
367-
template <bool relative = false>
364+
template <bool relative = false>
368365
BasicObjectLock* interpreter_frame_monitor_end() const;
369366
template <bool relative = false>
370367
BasicObjectLock* next_monitor_in_interpreter_frame(BasicObjectLock* current) const;

‎src/hotspot/share/runtime/frame_helpers.inline.hpp

+2-7
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ class Interpreted : public FrameCommon<Interpreted> {
8888
template <bool relative>
8989
static void patch_sender_sp(frame& f, intptr_t* sp);
9090

91-
static int num_oops(const frame&f, InterpreterOopMap* mask);
9291
static int size(const frame& f, InterpreterOopMap* mask);
9392
static int size(const frame& f);
9493
static inline int expression_stack_size(const frame &f, InterpreterOopMap* mask);
@@ -173,6 +172,7 @@ address Frame::return_pc(const frame& f) {
173172
#ifdef ASSERT
174173
intptr_t* Frame::frame_top(const frame &f) {
175174
if (f.is_interpreted_frame()) {
175+
ResourceMark rm;
176176
InterpreterOopMap mask;
177177
f.interpreted_frame_oop_map(&mask);
178178
return Interpreted::frame_top(f, &mask);
@@ -220,11 +220,6 @@ address Interpreted::return_pc(const frame& f) {
220220
return *return_pc_address(f);
221221
}
222222

223-
int Interpreted::num_oops(const frame&f, InterpreterOopMap* mask) {
224-
// all locks must be nullptr when freezing, but f.oops_do walks them, so we count them
225-
return f.interpreted_frame_num_oops(mask);
226-
}
227-
228223
int Interpreted::size(const frame&f) {
229224
return Interpreted::frame_bottom<true>(f) - Interpreted::frame_top(f);
230225
}
@@ -347,4 +342,4 @@ bool Compiled::is_owning_locks(JavaThread* thread, RegisterMapT* map, const fram
347342

348343
#include CPU_HEADER_INLINE(frame_helpers)
349344

350-
#endif // SHARE_VM_RUNTIME_FRAME_HELPERS_INLINE_HPP
345+
#endif // SHARE_VM_RUNTIME_FRAME_HELPERS_INLINE_HPP

0 commit comments

Comments
 (0)
Please sign in to comment.