Skip to content

Commit a6e794b

Browse files
coleenpcoleenp
committedJun 25, 2020
8248240: Remove extendedPC.hpp and fetch_frame_from_ucontext
This empty interface was left over from deleting code from before safepoint polling. Reviewed-by: lfoltan, dholmes
·
jdk-21+2121-genzgc+1-8
1 parent 06cea10 commit a6e794b

23 files changed

+99
-262
lines changed
 

‎src/hotspot/os/aix/os_aix.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
#include "prims/jvm_misc.hpp"
5454
#include "runtime/arguments.hpp"
5555
#include "runtime/atomic.hpp"
56-
#include "runtime/extendedPC.hpp"
5756
#include "runtime/globals.hpp"
5857
#include "runtime/interfaceSupport.inline.hpp"
5958
#include "runtime/java.hpp"
@@ -2704,7 +2703,7 @@ OSReturn os::get_native_priority(const Thread* const thread, int *priority_ptr)
27042703
// The SR_lock is, however, used by JavaThread::java_suspend()/java_resume() APIs.
27052704
//
27062705
// Note that resume_clear_context() and suspend_save_context() are needed
2707-
// by SR_handler(), so that fetch_frame_from_ucontext() works,
2706+
// by SR_handler(), so that fetch_frame_from_context() works,
27082707
// which in part is used by:
27092708
// - Forte Analyzer: AsyncGetCallTrace()
27102709
// - StackBanging: get_frame_at_stack_banging_point()

‎src/hotspot/os/bsd/os_bsd.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
#include "prims/jvm_misc.hpp"
4545
#include "runtime/arguments.hpp"
4646
#include "runtime/atomic.hpp"
47-
#include "runtime/extendedPC.hpp"
4847
#include "runtime/globals.hpp"
4948
#include "runtime/interfaceSupport.inline.hpp"
5049
#include "runtime/java.hpp"
@@ -2330,7 +2329,7 @@ OSReturn os::get_native_priority(const Thread* const thread, int *priority_ptr)
23302329
// The SR_lock is, however, used by JavaThread::java_suspend()/java_resume() APIs.
23312330
//
23322331
// Note that resume_clear_context() and suspend_save_context() are needed
2333-
// by SR_handler(), so that fetch_frame_from_ucontext() works,
2332+
// by SR_handler(), so that fetch_frame_from_context() works,
23342333
// which in part is used by:
23352334
// - Forte Analyzer: AsyncGetCallTrace()
23362335
// - StackBanging: get_frame_at_stack_banging_point()

‎src/hotspot/os/bsd/os_bsd.hpp

+1-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1999, 2020, 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
@@ -82,14 +82,6 @@ class Bsd {
8282
static intptr_t* ucontext_get_sp(const ucontext_t* uc);
8383
static intptr_t* ucontext_get_fp(const ucontext_t* uc);
8484

85-
// For Analyzer Forte AsyncGetCallTrace profiling support:
86-
//
87-
// This interface should be declared in os_bsd_i486.hpp, but
88-
// that file provides extensions to the os class and not the
89-
// Bsd class.
90-
static ExtendedPC fetch_frame_from_ucontext(Thread* thread, const ucontext_t* uc,
91-
intptr_t** ret_sp, intptr_t** ret_fp);
92-
9385
static bool get_frame_at_stack_banging_point(JavaThread* thread, ucontext_t* uc, frame* fr);
9486

9587
// This boolean allows users to forward their own non-matching signals

‎src/hotspot/os/linux/os_linux.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
#include "prims/jvm_misc.hpp"
4646
#include "runtime/arguments.hpp"
4747
#include "runtime/atomic.hpp"
48-
#include "runtime/extendedPC.hpp"
4948
#include "runtime/globals.hpp"
5049
#include "runtime/interfaceSupport.inline.hpp"
5150
#include "runtime/init.hpp"
@@ -4482,7 +4481,7 @@ OSReturn os::get_native_priority(const Thread* const thread,
44824481
// The SR_lock is, however, used by JavaThread::java_suspend()/java_resume() APIs.
44834482
//
44844483
// Note that resume_clear_context() and suspend_save_context() are needed
4485-
// by SR_handler(), so that fetch_frame_from_ucontext() works,
4484+
// by SR_handler(), so that fetch_frame_from_context() works,
44864485
// which in part is used by:
44874486
// - Forte Analyzer: AsyncGetCallTrace()
44884487
// - StackBanging: get_frame_at_stack_banging_point()

‎src/hotspot/os/linux/os_linux.hpp

-8
Original file line numberDiff line numberDiff line change
@@ -145,14 +145,6 @@ class Linux {
145145
static intptr_t* ucontext_get_sp(const ucontext_t* uc);
146146
static intptr_t* ucontext_get_fp(const ucontext_t* uc);
147147

148-
// For Analyzer Forte AsyncGetCallTrace profiling support:
149-
//
150-
// This interface should be declared in os_linux_i486.hpp, but
151-
// that file provides extensions to the os class and not the
152-
// Linux class.
153-
static ExtendedPC fetch_frame_from_ucontext(Thread* thread, const ucontext_t* uc,
154-
intptr_t** ret_sp, intptr_t** ret_fp);
155-
156148
static bool get_frame_at_stack_banging_point(JavaThread* thread, ucontext_t* uc, frame* fr);
157149

158150
// This boolean allows users to forward their own non-matching signals

‎src/hotspot/os/windows/os_windows.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
#include "prims/jvm_misc.hpp"
4747
#include "runtime/arguments.hpp"
4848
#include "runtime/atomic.hpp"
49-
#include "runtime/extendedPC.hpp"
5049
#include "runtime/globals.hpp"
5150
#include "runtime/interfaceSupport.inline.hpp"
5251
#include "runtime/java.hpp"

‎src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp

+8-10
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
#include "prims/jvm_misc.hpp"
4141
#include "porting_aix.hpp"
4242
#include "runtime/arguments.hpp"
43-
#include "runtime/extendedPC.hpp"
4443
#include "runtime/frame.inline.hpp"
4544
#include "runtime/interfaceSupport.inline.hpp"
4645
#include "runtime/java.hpp"
@@ -110,19 +109,18 @@ static address ucontext_get_lr(const ucontext_t * uc) {
110109
return (address)uc->uc_mcontext.jmp_context.lr;
111110
}
112111

113-
ExtendedPC os::fetch_frame_from_context(const void* ucVoid,
114-
intptr_t** ret_sp, intptr_t** ret_fp) {
112+
address os::fetch_frame_from_context(const void* ucVoid,
113+
intptr_t** ret_sp, intptr_t** ret_fp) {
115114

116-
ExtendedPC epc;
115+
address epc;
117116
const ucontext_t* uc = (const ucontext_t*)ucVoid;
118117

119118
if (uc != NULL) {
120-
epc = ExtendedPC(os::Aix::ucontext_get_pc(uc));
119+
epc = os::Aix::ucontext_get_pc(uc);
121120
if (ret_sp) *ret_sp = os::Aix::ucontext_get_sp(uc);
122121
if (ret_fp) *ret_fp = os::Aix::ucontext_get_fp(uc);
123122
} else {
124-
// construct empty ExtendedPC for return value checking
125-
epc = ExtendedPC(NULL);
123+
epc = NULL;
126124
if (ret_sp) *ret_sp = (intptr_t *)NULL;
127125
if (ret_fp) *ret_fp = (intptr_t *)NULL;
128126
}
@@ -133,10 +131,10 @@ ExtendedPC os::fetch_frame_from_context(const void* ucVoid,
133131
frame os::fetch_frame_from_context(const void* ucVoid) {
134132
intptr_t* sp;
135133
intptr_t* fp;
136-
ExtendedPC epc = fetch_frame_from_context(ucVoid, &sp, &fp);
134+
address epc = fetch_frame_from_context(ucVoid, &sp, &fp);
137135
// Avoid crash during crash if pc broken.
138-
if (epc.pc()) {
139-
frame fr(sp, epc.pc());
136+
if (epc) {
137+
frame fr(sp, epc);
140138
return fr;
141139
}
142140
frame fr(sp);

‎src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp

+8-33
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
#include "prims/jniFastGetField.hpp"
3939
#include "prims/jvm_misc.hpp"
4040
#include "runtime/arguments.hpp"
41-
#include "runtime/extendedPC.hpp"
4241
#include "runtime/frame.inline.hpp"
4342
#include "runtime/interfaceSupport.inline.hpp"
4443
#include "runtime/java.hpp"
@@ -313,35 +312,18 @@ intptr_t* os::Bsd::ucontext_get_fp(const ucontext_t * uc) {
313312
return (intptr_t*)uc->context_fp;
314313
}
315314

316-
// For Forte Analyzer AsyncGetCallTrace profiling support - thread
317-
// is currently interrupted by SIGPROF.
318-
// os::Solaris::fetch_frame_from_ucontext() tries to skip nested signal
319-
// frames. Currently we don't do that on Bsd, so it's the same as
320-
// os::fetch_frame_from_context().
321-
// This method is also used for stack overflow signal handling.
322-
ExtendedPC os::Bsd::fetch_frame_from_ucontext(Thread* thread,
323-
const ucontext_t* uc, intptr_t** ret_sp, intptr_t** ret_fp) {
324-
325-
assert(thread != NULL, "just checking");
326-
assert(ret_sp != NULL, "just checking");
327-
assert(ret_fp != NULL, "just checking");
328-
329-
return os::fetch_frame_from_context(uc, ret_sp, ret_fp);
330-
}
331-
332-
ExtendedPC os::fetch_frame_from_context(const void* ucVoid,
315+
address os::fetch_frame_from_context(const void* ucVoid,
333316
intptr_t** ret_sp, intptr_t** ret_fp) {
334317

335-
ExtendedPC epc;
318+
address epc;
336319
const ucontext_t* uc = (const ucontext_t*)ucVoid;
337320

338321
if (uc != NULL) {
339-
epc = ExtendedPC(os::Bsd::ucontext_get_pc(uc));
322+
epc = os::Bsd::ucontext_get_pc(uc);
340323
if (ret_sp) *ret_sp = os::Bsd::ucontext_get_sp(uc);
341324
if (ret_fp) *ret_fp = os::Bsd::ucontext_get_fp(uc);
342325
} else {
343-
// construct empty ExtendedPC for return value checking
344-
epc = ExtendedPC(NULL);
326+
epc = NULL;
345327
if (ret_sp) *ret_sp = (intptr_t *)NULL;
346328
if (ret_fp) *ret_fp = (intptr_t *)NULL;
347329
}
@@ -352,15 +334,8 @@ ExtendedPC os::fetch_frame_from_context(const void* ucVoid,
352334
frame os::fetch_frame_from_context(const void* ucVoid) {
353335
intptr_t* sp;
354336
intptr_t* fp;
355-
ExtendedPC epc = fetch_frame_from_context(ucVoid, &sp, &fp);
356-
return frame(sp, fp, epc.pc());
357-
}
358-
359-
frame os::fetch_frame_from_ucontext(Thread* thread, void* ucVoid) {
360-
intptr_t* sp;
361-
intptr_t* fp;
362-
ExtendedPC epc = os::Bsd::fetch_frame_from_ucontext(thread, (ucontext_t*)ucVoid, &sp, &fp);
363-
return frame(sp, fp, epc.pc());
337+
address epc = fetch_frame_from_context(ucVoid, &sp, &fp);
338+
return frame(sp, fp, epc);
364339
}
365340

366341
bool os::Bsd::get_frame_at_stack_banging_point(JavaThread* thread, ucontext_t* uc, frame* fr) {
@@ -370,7 +345,7 @@ bool os::Bsd::get_frame_at_stack_banging_point(JavaThread* thread, ucontext_t* u
370345
// been generated while the compilers perform it before. To maintain
371346
// semantic consistency between interpreted and compiled frames, the
372347
// method returns the Java sender of the current frame.
373-
*fr = os::fetch_frame_from_ucontext(thread, uc);
348+
*fr = os::fetch_frame_from_context(uc);
374349
if (!fr->is_first_java_frame()) {
375350
// get_frame_at_stack_banging_point() is only called when we
376351
// have well defined stacks so java_sender() calls do not need
@@ -386,7 +361,7 @@ bool os::Bsd::get_frame_at_stack_banging_point(JavaThread* thread, ucontext_t* u
386361
// stack overflow handling
387362
return false;
388363
} else {
389-
*fr = os::fetch_frame_from_ucontext(thread, uc);
364+
*fr = os::fetch_frame_from_context(uc);
390365
// in compiled code, the stack banging is performed just after the return pc
391366
// has been pushed on the stack
392367
*fr = frame(fr->sp() + 1, fr->fp(), (address)*(fr->sp()));

‎src/hotspot/os_cpu/bsd_x86/thread_bsd_x86.cpp

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2003, 2020, 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
@@ -64,24 +64,23 @@ bool JavaThread::pd_get_top_frame(frame* fr_addr, void* ucontext, bool isInJava)
6464

6565
intptr_t* ret_fp;
6666
intptr_t* ret_sp;
67-
ExtendedPC addr = os::Bsd::fetch_frame_from_ucontext(this, uc,
68-
&ret_sp, &ret_fp);
69-
if (addr.pc() == NULL || ret_sp == NULL ) {
67+
address addr = os::fetch_frame_from_context(uc, &ret_sp, &ret_fp);
68+
if (addr == NULL || ret_sp == NULL ) {
7069
// ucontext wasn't useful
7170
return false;
7271
}
7372

74-
if (MetaspaceShared::is_in_trampoline_frame(addr.pc())) {
73+
if (MetaspaceShared::is_in_trampoline_frame(addr)) {
7574
// In the middle of a trampoline call. Bail out for safety.
7675
// This happens rarely so shouldn't affect profiling.
7776
return false;
7877
}
7978

80-
frame ret_frame(ret_sp, ret_fp, addr.pc());
79+
frame ret_frame(ret_sp, ret_fp, addr);
8180
if (!ret_frame.safe_for_sender(jt)) {
8281
#if COMPILER2_OR_JVMCI
8382
// C2 and JVMCI use ebp as a general register see if NULL fp helps
84-
frame ret_frame2(ret_sp, NULL, addr.pc());
83+
frame ret_frame2(ret_sp, NULL, addr);
8584
if (!ret_frame2.safe_for_sender(jt)) {
8685
// nothing else to try if the frame isn't good
8786
return false;

‎src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp

+4-5
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
#include "prims/jniFastGetField.hpp"
4444
#include "prims/jvm_misc.hpp"
4545
#include "runtime/arguments.hpp"
46-
#include "runtime/extendedPC.hpp"
4746
#include "runtime/frame.inline.hpp"
4847
#include "runtime/interfaceSupport.inline.hpp"
4948
#include "runtime/java.hpp"
@@ -103,11 +102,11 @@ void os::Bsd::ucontext_set_pc(ucontext_t * uc, address pc) {
103102
ShouldNotCallThis();
104103
}
105104

106-
ExtendedPC os::fetch_frame_from_context(const void* ucVoid,
107-
intptr_t** ret_sp,
108-
intptr_t** ret_fp) {
105+
address os::fetch_frame_from_context(const void* ucVoid,
106+
intptr_t** ret_sp,
107+
intptr_t** ret_fp) {
109108
ShouldNotCallThis();
110-
return ExtendedPC();
109+
return NULL;
111110
}
112111

113112
frame os::fetch_frame_from_context(const void* ucVoid) {

‎src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp

+6-23
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
#include "prims/jniFastGetField.hpp"
4040
#include "prims/jvm_misc.hpp"
4141
#include "runtime/arguments.hpp"
42-
#include "runtime/extendedPC.hpp"
4342
#include "runtime/frame.inline.hpp"
4443
#include "runtime/interfaceSupport.inline.hpp"
4544
#include "runtime/java.hpp"
@@ -108,34 +107,18 @@ intptr_t* os::Linux::ucontext_get_fp(const ucontext_t * uc) {
108107
return (intptr_t*)uc->uc_mcontext.regs[REG_FP];
109108
}
110109

111-
// For Forte Analyzer AsyncGetCallTrace profiling support - thread
112-
// is currently interrupted by SIGPROF.
113-
// os::Solaris::fetch_frame_from_ucontext() tries to skip nested signal
114-
// frames. Currently we don't do that on Linux, so it's the same as
115-
// os::fetch_frame_from_context().
116-
ExtendedPC os::Linux::fetch_frame_from_ucontext(Thread* thread,
117-
const ucontext_t* uc, intptr_t** ret_sp, intptr_t** ret_fp) {
118-
119-
assert(thread != NULL, "just checking");
120-
assert(ret_sp != NULL, "just checking");
121-
assert(ret_fp != NULL, "just checking");
122-
123-
return os::fetch_frame_from_context(uc, ret_sp, ret_fp);
124-
}
125-
126-
ExtendedPC os::fetch_frame_from_context(const void* ucVoid,
110+
address os::fetch_frame_from_context(const void* ucVoid,
127111
intptr_t** ret_sp, intptr_t** ret_fp) {
128112

129-
ExtendedPC epc;
113+
address epc;
130114
const ucontext_t* uc = (const ucontext_t*)ucVoid;
131115

132116
if (uc != NULL) {
133-
epc = ExtendedPC(os::Linux::ucontext_get_pc(uc));
117+
epc = os::Linux::ucontext_get_pc(uc);
134118
if (ret_sp) *ret_sp = os::Linux::ucontext_get_sp(uc);
135119
if (ret_fp) *ret_fp = os::Linux::ucontext_get_fp(uc);
136120
} else {
137-
// construct empty ExtendedPC for return value checking
138-
epc = ExtendedPC(NULL);
121+
epc = NULL;
139122
if (ret_sp) *ret_sp = (intptr_t *)NULL;
140123
if (ret_fp) *ret_fp = (intptr_t *)NULL;
141124
}
@@ -146,8 +129,8 @@ ExtendedPC os::fetch_frame_from_context(const void* ucVoid,
146129
frame os::fetch_frame_from_context(const void* ucVoid) {
147130
intptr_t* sp;
148131
intptr_t* fp;
149-
ExtendedPC epc = fetch_frame_from_context(ucVoid, &sp, &fp);
150-
return frame(sp, fp, epc.pc());
132+
address epc = fetch_frame_from_context(ucVoid, &sp, &fp);
133+
return frame(sp, fp, epc);
151134
}
152135

153136
bool os::Linux::get_frame_at_stack_banging_point(JavaThread* thread, ucontext_t* uc, frame* fr) {

‎src/hotspot/os_cpu/linux_aarch64/thread_linux_aarch64.cpp

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2003, 2020, 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
*
@@ -65,23 +65,22 @@ bool JavaThread::pd_get_top_frame(frame* fr_addr, void* ucontext, bool isInJava)
6565

6666
intptr_t* ret_fp;
6767
intptr_t* ret_sp;
68-
ExtendedPC addr = os::Linux::fetch_frame_from_ucontext(this, uc,
69-
&ret_sp, &ret_fp);
70-
if (addr.pc() == NULL || ret_sp == NULL ) {
68+
address addr = os::fetch_frame_from_context(uc, &ret_sp, &ret_fp);
69+
if (addr == NULL || ret_sp == NULL ) {
7170
// ucontext wasn't useful
7271
return false;
7372
}
7473

75-
if (MetaspaceShared::is_in_trampoline_frame(addr.pc())) {
74+
if (MetaspaceShared::is_in_trampoline_frame(addr)) {
7675
// In the middle of a trampoline call. Bail out for safety.
7776
// This happens rarely so shouldn't affect profiling.
7877
return false;
7978
}
8079

81-
frame ret_frame(ret_sp, ret_fp, addr.pc());
80+
frame ret_frame(ret_sp, ret_fp, addr);
8281
if (!ret_frame.safe_for_sender(jt)) {
8382
#ifdef COMPILER2
84-
frame ret_frame2(ret_sp, NULL, addr.pc());
83+
frame ret_frame2(ret_sp, NULL, addr);
8584
if (!ret_frame2.safe_for_sender(jt)) {
8685
// nothing else to try if the frame isn't good
8786
return false;

‎src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp

+8-25
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
#include "prims/jniFastGetField.hpp"
3838
#include "prims/jvm_misc.hpp"
3939
#include "runtime/arguments.hpp"
40-
#include "runtime/extendedPC.hpp"
4140
#include "runtime/frame.inline.hpp"
4241
#include "runtime/interfaceSupport.inline.hpp"
4342
#include "runtime/java.hpp"
@@ -142,34 +141,19 @@ bool is_safe_for_fp(address pc) {
142141
#endif
143142
}
144143

145-
// For Forte Analyzer AsyncGetCallTrace profiling support - thread
146-
// is currently interrupted by SIGPROF.
147-
// os::Solaris::fetch_frame_from_ucontext() tries to skip nested signal
148-
// frames. Currently we don't do that on Linux, so it's the same as
149-
// os::fetch_frame_from_context().
150-
ExtendedPC os::Linux::fetch_frame_from_ucontext(Thread* thread,
151-
const ucontext_t* uc, intptr_t** ret_sp, intptr_t** ret_fp) {
152-
153-
assert(thread != NULL, "just checking");
154-
assert(ret_sp != NULL, "just checking");
155-
assert(ret_fp != NULL, "just checking");
156-
157-
return os::fetch_frame_from_context(uc, ret_sp, ret_fp);
158-
}
159-
160-
ExtendedPC os::fetch_frame_from_context(const void* ucVoid,
144+
address os::fetch_frame_from_context(const void* ucVoid,
161145
intptr_t** ret_sp, intptr_t** ret_fp) {
162146

163-
ExtendedPC epc;
147+
address epc;
164148
const ucontext_t* uc = (const ucontext_t*)ucVoid;
165149

166150
if (uc != NULL) {
167-
epc = ExtendedPC(os::Linux::ucontext_get_pc(uc));
151+
epc = os::Linux::ucontext_get_pc(uc);
168152
if (ret_sp) *ret_sp = os::Linux::ucontext_get_sp(uc);
169153
if (ret_fp) {
170154
intptr_t* fp = os::Linux::ucontext_get_fp(uc);
171155
#ifndef __thumb__
172-
if (CodeCache::find_blob(epc.pc()) == NULL) {
156+
if (CodeCache::find_blob(epc) == NULL) {
173157
// It's a C frame. We need to adjust the fp.
174158
fp += os::C_frame_offset;
175159
}
@@ -178,15 +162,14 @@ ExtendedPC os::fetch_frame_from_context(const void* ucVoid,
178162
// the frame created will not be walked.
179163
// However, ensure FP is set correctly when reliable and
180164
// potentially necessary.
181-
if (!is_safe_for_fp(epc.pc())) {
165+
if (!is_safe_for_fp(epc)) {
182166
// FP unreliable
183167
fp = (intptr_t *)NULL;
184168
}
185169
*ret_fp = fp;
186170
}
187171
} else {
188-
// construct empty ExtendedPC for return value checking
189-
epc = ExtendedPC(NULL);
172+
epc = NULL;
190173
if (ret_sp) *ret_sp = (intptr_t *)NULL;
191174
if (ret_fp) *ret_fp = (intptr_t *)NULL;
192175
}
@@ -197,8 +180,8 @@ ExtendedPC os::fetch_frame_from_context(const void* ucVoid,
197180
frame os::fetch_frame_from_context(const void* ucVoid) {
198181
intptr_t* sp;
199182
intptr_t* fp;
200-
ExtendedPC epc = fetch_frame_from_context(ucVoid, &sp, &fp);
201-
return frame(sp, fp, epc.pc());
183+
address epc = fetch_frame_from_context(ucVoid, &sp, &fp);
184+
return frame(sp, fp, epc);
202185
}
203186

204187
frame os::get_sender_for_C_frame(frame* fr) {

‎src/hotspot/os_cpu/linux_arm/thread_linux_arm.cpp

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2008, 2020, 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
@@ -99,24 +99,23 @@ bool JavaThread::pd_get_top_frame(frame* fr_addr, void* ucontext, bool isInJava)
9999

100100
intptr_t* ret_fp;
101101
intptr_t* ret_sp;
102-
ExtendedPC addr = os::Linux::fetch_frame_from_ucontext(this, uc,
103-
&ret_sp, &ret_fp);
104-
if (addr.pc() == NULL || ret_sp == NULL ) {
102+
address addr = os::fetch_frame_from_context(uc, &ret_sp, &ret_fp);
103+
if (addr == NULL || ret_sp == NULL ) {
105104
// ucontext wasn't useful
106105
return false;
107106
}
108107

109-
if (MetaspaceShared::is_in_trampoline_frame(addr.pc())) {
108+
if (MetaspaceShared::is_in_trampoline_frame(addr)) {
110109
// In the middle of a trampoline call. Bail out for safety.
111110
// This happens rarely so shouldn't affect profiling.
112111
return false;
113112
}
114113

115-
frame ret_frame(ret_sp, ret_fp, addr.pc());
114+
frame ret_frame(ret_sp, ret_fp, addr);
116115
if (!ret_frame.safe_for_sender(jt)) {
117116
#ifdef COMPILER2
118117
// C2 uses ebp as a general register see if NULL fp helps
119-
frame ret_frame2(ret_sp, NULL, addr.pc());
118+
frame ret_frame2(ret_sp, NULL, addr);
120119
if (!ret_frame2.safe_for_sender(jt)) {
121120
// nothing else to try if the frame isn't good
122121
return false;

‎src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp

+6-8
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
#include "prims/jniFastGetField.hpp"
4040
#include "prims/jvm_misc.hpp"
4141
#include "runtime/arguments.hpp"
42-
#include "runtime/extendedPC.hpp"
4342
#include "runtime/frame.inline.hpp"
4443
#include "runtime/interfaceSupport.inline.hpp"
4544
#include "runtime/java.hpp"
@@ -136,19 +135,18 @@ static unsigned long ucontext_get_trap(const ucontext_t * uc) {
136135
return uc->uc_mcontext.regs->trap;
137136
}
138137

139-
ExtendedPC os::fetch_frame_from_context(const void* ucVoid,
138+
address os::fetch_frame_from_context(const void* ucVoid,
140139
intptr_t** ret_sp, intptr_t** ret_fp) {
141140

142-
ExtendedPC epc;
141+
address epc;
143142
const ucontext_t* uc = (const ucontext_t*)ucVoid;
144143

145144
if (uc != NULL) {
146-
epc = ExtendedPC(os::Linux::ucontext_get_pc(uc));
145+
epc = os::Linux::ucontext_get_pc(uc);
147146
if (ret_sp) *ret_sp = os::Linux::ucontext_get_sp(uc);
148147
if (ret_fp) *ret_fp = os::Linux::ucontext_get_fp(uc);
149148
} else {
150-
// construct empty ExtendedPC for return value checking
151-
epc = ExtendedPC(NULL);
149+
epc = NULL;
152150
if (ret_sp) *ret_sp = (intptr_t *)NULL;
153151
if (ret_fp) *ret_fp = (intptr_t *)NULL;
154152
}
@@ -159,8 +157,8 @@ ExtendedPC os::fetch_frame_from_context(const void* ucVoid,
159157
frame os::fetch_frame_from_context(const void* ucVoid) {
160158
intptr_t* sp;
161159
intptr_t* fp;
162-
ExtendedPC epc = fetch_frame_from_context(ucVoid, &sp, &fp);
163-
return frame(sp, epc.pc());
160+
address epc = fetch_frame_from_context(ucVoid, &sp, &fp);
161+
return frame(sp, epc);
164162
}
165163

166164
bool os::Linux::get_frame_at_stack_banging_point(JavaThread* thread, ucontext_t* uc, frame* fr) {

‎src/hotspot/os_cpu/linux_s390/os_linux_s390.cpp

+6-8
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
#include "prims/jniFastGetField.hpp"
4343
#include "prims/jvm_misc.hpp"
4444
#include "runtime/arguments.hpp"
45-
#include "runtime/extendedPC.hpp"
4645
#include "runtime/frame.inline.hpp"
4746
#include "runtime/interfaceSupport.inline.hpp"
4847
#include "runtime/java.hpp"
@@ -119,19 +118,18 @@ intptr_t* os::Linux::ucontext_get_fp(const ucontext_t * uc) {
119118
return NULL;
120119
}
121120

122-
ExtendedPC os::fetch_frame_from_context(const void* ucVoid,
121+
address os::fetch_frame_from_context(const void* ucVoid,
123122
intptr_t** ret_sp, intptr_t** ret_fp) {
124123

125-
ExtendedPC epc;
124+
address epc;
126125
const ucontext_t* uc = (const ucontext_t*)ucVoid;
127126

128127
if (uc != NULL) {
129-
epc = ExtendedPC(os::Linux::ucontext_get_pc(uc));
128+
epc = os::Linux::ucontext_get_pc(uc);
130129
if (ret_sp) { *ret_sp = os::Linux::ucontext_get_sp(uc); }
131130
if (ret_fp) { *ret_fp = os::Linux::ucontext_get_fp(uc); }
132131
} else {
133-
// Construct empty ExtendedPC for return value checking.
134-
epc = ExtendedPC(NULL);
132+
epc = NULL;
135133
if (ret_sp) { *ret_sp = (intptr_t *)NULL; }
136134
if (ret_fp) { *ret_fp = (intptr_t *)NULL; }
137135
}
@@ -142,8 +140,8 @@ ExtendedPC os::fetch_frame_from_context(const void* ucVoid,
142140
frame os::fetch_frame_from_context(const void* ucVoid) {
143141
intptr_t* sp;
144142
intptr_t* fp;
145-
ExtendedPC epc = fetch_frame_from_context(ucVoid, &sp, &fp);
146-
return frame(sp, epc.pc());
143+
address epc = fetch_frame_from_context(ucVoid, &sp, &fp);
144+
return frame(sp, epc);
147145
}
148146

149147
bool os::Linux::get_frame_at_stack_banging_point(JavaThread* thread, ucontext_t* uc, frame* fr) {

‎src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp

+7-32
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
#include "prims/jniFastGetField.hpp"
3939
#include "prims/jvm_misc.hpp"
4040
#include "runtime/arguments.hpp"
41-
#include "runtime/extendedPC.hpp"
4241
#include "runtime/frame.inline.hpp"
4342
#include "runtime/interfaceSupport.inline.hpp"
4443
#include "runtime/java.hpp"
@@ -122,35 +121,18 @@ intptr_t* os::Linux::ucontext_get_fp(const ucontext_t * uc) {
122121
return (intptr_t*)uc->uc_mcontext.gregs[REG_FP];
123122
}
124123

125-
// For Forte Analyzer AsyncGetCallTrace profiling support - thread
126-
// is currently interrupted by SIGPROF.
127-
// os::Solaris::fetch_frame_from_ucontext() tries to skip nested signal
128-
// frames. Currently we don't do that on Linux, so it's the same as
129-
// os::fetch_frame_from_context().
130-
// This method is also used for stack overflow signal handling.
131-
ExtendedPC os::Linux::fetch_frame_from_ucontext(Thread* thread,
132-
const ucontext_t* uc, intptr_t** ret_sp, intptr_t** ret_fp) {
133-
134-
assert(thread != NULL, "just checking");
135-
assert(ret_sp != NULL, "just checking");
136-
assert(ret_fp != NULL, "just checking");
137-
138-
return os::fetch_frame_from_context(uc, ret_sp, ret_fp);
139-
}
140-
141-
ExtendedPC os::fetch_frame_from_context(const void* ucVoid,
124+
address os::fetch_frame_from_context(const void* ucVoid,
142125
intptr_t** ret_sp, intptr_t** ret_fp) {
143126

144-
ExtendedPC epc;
127+
address epc;
145128
const ucontext_t* uc = (const ucontext_t*)ucVoid;
146129

147130
if (uc != NULL) {
148-
epc = ExtendedPC(os::Linux::ucontext_get_pc(uc));
131+
epc = os::Linux::ucontext_get_pc(uc);
149132
if (ret_sp) *ret_sp = os::Linux::ucontext_get_sp(uc);
150133
if (ret_fp) *ret_fp = os::Linux::ucontext_get_fp(uc);
151134
} else {
152-
// construct empty ExtendedPC for return value checking
153-
epc = ExtendedPC(NULL);
135+
epc = NULL;
154136
if (ret_sp) *ret_sp = (intptr_t *)NULL;
155137
if (ret_fp) *ret_fp = (intptr_t *)NULL;
156138
}
@@ -161,15 +143,8 @@ ExtendedPC os::fetch_frame_from_context(const void* ucVoid,
161143
frame os::fetch_frame_from_context(const void* ucVoid) {
162144
intptr_t* sp;
163145
intptr_t* fp;
164-
ExtendedPC epc = fetch_frame_from_context(ucVoid, &sp, &fp);
165-
return frame(sp, fp, epc.pc());
166-
}
167-
168-
frame os::fetch_frame_from_ucontext(Thread* thread, void* ucVoid) {
169-
intptr_t* sp;
170-
intptr_t* fp;
171-
ExtendedPC epc = os::Linux::fetch_frame_from_ucontext(thread, (ucontext_t*)ucVoid, &sp, &fp);
172-
return frame(sp, fp, epc.pc());
146+
address epc = fetch_frame_from_context(ucVoid, &sp, &fp);
147+
return frame(sp, fp, epc);
173148
}
174149

175150
bool os::Linux::get_frame_at_stack_banging_point(JavaThread* thread, ucontext_t* uc, frame* fr) {
@@ -179,7 +154,7 @@ bool os::Linux::get_frame_at_stack_banging_point(JavaThread* thread, ucontext_t*
179154
// been generated while the compilers perform it before. To maintain
180155
// semantic consistency between interpreted and compiled frames, the
181156
// method returns the Java sender of the current frame.
182-
*fr = os::fetch_frame_from_ucontext(thread, uc);
157+
*fr = os::fetch_frame_from_context(uc);
183158
if (!fr->is_first_java_frame()) {
184159
// get_frame_at_stack_banging_point() is only called when we
185160
// have well defined stacks so java_sender() calls do not need

‎src/hotspot/os_cpu/linux_x86/thread_linux_x86.cpp

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2003, 2020, 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
@@ -65,24 +65,23 @@ bool JavaThread::pd_get_top_frame(frame* fr_addr, void* ucontext, bool isInJava)
6565

6666
intptr_t* ret_fp;
6767
intptr_t* ret_sp;
68-
ExtendedPC addr = os::Linux::fetch_frame_from_ucontext(this, uc,
69-
&ret_sp, &ret_fp);
70-
if (addr.pc() == NULL || ret_sp == NULL ) {
68+
address addr = os::fetch_frame_from_context(uc, &ret_sp, &ret_fp);
69+
if (addr == NULL || ret_sp == NULL ) {
7170
// ucontext wasn't useful
7271
return false;
7372
}
7473

75-
if (MetaspaceShared::is_in_trampoline_frame(addr.pc())) {
74+
if (MetaspaceShared::is_in_trampoline_frame(addr)) {
7675
// In the middle of a trampoline call. Bail out for safety.
7776
// This happens rarely so shouldn't affect profiling.
7877
return false;
7978
}
8079

81-
frame ret_frame(ret_sp, ret_fp, addr.pc());
80+
frame ret_frame(ret_sp, ret_fp, addr);
8281
if (!ret_frame.safe_for_sender(jt)) {
8382
#if COMPILER2_OR_JVMCI
8483
// C2 and JVMCI use ebp as a general register see if NULL fp helps
85-
frame ret_frame2(ret_sp, NULL, addr.pc());
84+
frame ret_frame2(ret_sp, NULL, addr);
8685
if (!ret_frame2.safe_for_sender(jt)) {
8786
// nothing else to try if the frame isn't good
8887
return false;

‎src/hotspot/os_cpu/linux_zero/os_linux_zero.cpp

+3-4
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
#include "prims/jniFastGetField.hpp"
3939
#include "prims/jvm_misc.hpp"
4040
#include "runtime/arguments.hpp"
41-
#include "runtime/extendedPC.hpp"
4241
#include "runtime/frame.inline.hpp"
4342
#include "runtime/interfaceSupport.inline.hpp"
4443
#include "runtime/java.hpp"
@@ -99,9 +98,9 @@ void os::Linux::ucontext_set_pc(ucontext_t * uc, address pc) {
9998
ShouldNotCallThis();
10099
}
101100

102-
ExtendedPC os::fetch_frame_from_context(const void* ucVoid,
103-
intptr_t** ret_sp,
104-
intptr_t** ret_fp) {
101+
address os::fetch_frame_from_context(const void* ucVoid,
102+
intptr_t** ret_sp,
103+
intptr_t** ret_fp) {
105104
ShouldNotCallThis();
106105
return NULL; // silence compile warnings
107106
}

‎src/hotspot/os_cpu/windows_x86/os_windows_x86.cpp

+7-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1999, 2020, 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
@@ -38,7 +38,6 @@
3838
#include "prims/jniFastGetField.hpp"
3939
#include "prims/jvm_misc.hpp"
4040
#include "runtime/arguments.hpp"
41-
#include "runtime/extendedPC.hpp"
4241
#include "runtime/frame.inline.hpp"
4342
#include "runtime/interfaceSupport.inline.hpp"
4443
#include "runtime/java.hpp"
@@ -430,19 +429,18 @@ bool os::platform_print_native_stack(outputStream* st, const void* context,
430429
}
431430
#endif // AMD64
432431

433-
ExtendedPC os::fetch_frame_from_context(const void* ucVoid,
432+
address os::fetch_frame_from_context(const void* ucVoid,
434433
intptr_t** ret_sp, intptr_t** ret_fp) {
435434

436-
ExtendedPC epc;
435+
address epc;
437436
CONTEXT* uc = (CONTEXT*)ucVoid;
438437

439438
if (uc != NULL) {
440-
epc = ExtendedPC((address)uc->REG_PC);
439+
epc = (address)uc->REG_PC;
441440
if (ret_sp) *ret_sp = (intptr_t*)uc->REG_SP;
442441
if (ret_fp) *ret_fp = (intptr_t*)uc->REG_FP;
443442
} else {
444-
// construct empty ExtendedPC for return value checking
445-
epc = ExtendedPC(NULL);
443+
epc = NULL;
446444
if (ret_sp) *ret_sp = (intptr_t *)NULL;
447445
if (ret_fp) *ret_fp = (intptr_t *)NULL;
448446
}
@@ -453,8 +451,8 @@ ExtendedPC os::fetch_frame_from_context(const void* ucVoid,
453451
frame os::fetch_frame_from_context(const void* ucVoid) {
454452
intptr_t* sp;
455453
intptr_t* fp;
456-
ExtendedPC epc = fetch_frame_from_context(ucVoid, &sp, &fp);
457-
return frame(sp, fp, epc.pc());
454+
address epc = fetch_frame_from_context(ucVoid, &sp, &fp);
455+
return frame(sp, fp, epc);
458456
}
459457

460458
// VC++ does not save frame pointer on stack in optimized build. It

‎src/hotspot/os_cpu/windows_x86/thread_windows_x86.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2003, 2020, 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
@@ -68,28 +68,28 @@ bool JavaThread::pd_get_top_frame(frame* fr_addr, void* ucontext, bool isInJava)
6868
#ifdef AMD64
6969
intptr_t* ret_fp = (intptr_t*) uc->Rbp;
7070
intptr_t* ret_sp = (intptr_t*) uc->Rsp;
71-
ExtendedPC addr = ExtendedPC((address)uc->Rip);
71+
address addr = (address)uc->Rip;
7272
#else
7373
intptr_t* ret_fp = (intptr_t*) uc->Ebp;
7474
intptr_t* ret_sp = (intptr_t*) uc->Esp;
75-
ExtendedPC addr = ExtendedPC((address)uc->Eip);
75+
address addr = (address)uc->Eip;
7676
#endif // AMD64
77-
if (addr.pc() == NULL || ret_sp == NULL ) {
77+
if (addr == NULL || ret_sp == NULL ) {
7878
// CONTEXT wasn't useful
7979
return false;
8080
}
8181

82-
if (MetaspaceShared::is_in_trampoline_frame(addr.pc())) {
82+
if (MetaspaceShared::is_in_trampoline_frame(addr)) {
8383
// In the middle of a trampoline call. Bail out for safety.
8484
// This happens rarely so shouldn't affect profiling.
8585
return false;
8686
}
8787

88-
frame ret_frame(ret_sp, ret_fp, addr.pc());
88+
frame ret_frame(ret_sp, ret_fp, addr);
8989
if (!ret_frame.safe_for_sender(jt)) {
9090
#if COMPILER2_OR_JVMCI
9191
// C2 and JVMCI use ebp as a general register see if NULL fp helps
92-
frame ret_frame2(ret_sp, NULL, addr.pc());
92+
frame ret_frame2(ret_sp, NULL, addr);
9393
if (!ret_frame2.safe_for_sender(jt)) {
9494
// nothing else to try if the frame isn't good
9595
return false;

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

-43
This file was deleted.

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#include "jvmtifiles/jvmti.h"
3030
#include "metaprogramming/isRegisteredEnum.hpp"
3131
#include "metaprogramming/integralConstant.hpp"
32-
#include "runtime/extendedPC.hpp"
3332
#include "utilities/exceptions.hpp"
3433
#include "utilities/ostream.hpp"
3534
#include "utilities/macros.hpp"
@@ -473,9 +472,8 @@ class os: AllStatic {
473472

474473
static int pd_self_suspend_thread(Thread* thread);
475474

476-
static ExtendedPC fetch_frame_from_context(const void* ucVoid, intptr_t** sp, intptr_t** fp);
475+
static address fetch_frame_from_context(const void* ucVoid, intptr_t** sp, intptr_t** fp);
477476
static frame fetch_frame_from_context(const void* ucVoid);
478-
static frame fetch_frame_from_ucontext(Thread* thread, void* ucVoid);
479477

480478
static void breakpoint();
481479
static bool start_debugging(char *buf, int buflen);

0 commit comments

Comments
 (0)
Please sign in to comment.