Skip to content

Commit 956ecc3

Browse files
committed
revert java frame anchor changes
1 parent b334edb commit 956ecc3

File tree

2 files changed

+0
-12
lines changed

2 files changed

+0
-12
lines changed

src/hotspot/cpu/s390/javaFrameAnchor_s390.hpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
#ifndef CPU_S390_JAVAFRAMEANCHOR_S390_HPP
2727
#define CPU_S390_JAVAFRAMEANCHOR_S390_HPP
2828

29-
JFR_ONLY(intptr_t* volatile _last_sender_Java_fp;) // specialized field for when JFR samples an interpreter frame
30-
3129
public:
3230

3331
// Each arch must define reset, save, restore.
@@ -44,7 +42,6 @@
4442
OrderAccess::fence();
4543

4644
_last_Java_pc = nullptr;
47-
JFR_ONLY(_last_sender_Java_fp = nullptr;)
4845
}
4946

5047
inline void set(intptr_t* sp, address pc) {
@@ -67,7 +64,6 @@
6764
OrderAccess::fence();
6865
}
6966
_last_Java_pc = src->_last_Java_pc;
70-
JFR_ONLY(_last_sender_Java_fp = src->_last_sender_Java_fp;)
7167
// Must be last so profiler will always see valid frame if has_last_frame() is true.
7268

7369
OrderAccess::release();
@@ -88,9 +84,4 @@
8884

8985
address last_Java_pc(void) { return _last_Java_pc; }
9086

91-
intptr_t* last_Java_fp() const { return *(intptr_t**)_last_Java_sp; }
92-
93-
JFR_ONLY(intptr_t* last_sender_Java_fp() const { return _last_sender_Java_fp;})
94-
JFR_ONLY(static ByteSize last_sender_Java_fp_offset() { return byte_offset_of(JavaFrameAnchor, _last_sender_Java_fp); })
95-
9687
#endif // CPU_S390_JAVAFRAMEANCHOR_S390_HPP

src/hotspot/os_cpu/linux_s390/javaThread_linux_s390.hpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,4 @@
4040

4141
bool pd_get_top_frame_for_profiling(frame* fr_addr, void* ucontext, bool isInJava);
4242

43-
JFR_ONLY(static ByteSize last_sender_Java_fp_offset() {
44-
return byte_offset_of(JavaThread, _anchor) + JavaFrameAnchor::last_sender_Java_fp_offset();
45-
})
4643
#endif // OS_CPU_LINUX_S390_JAVATHREAD_LINUX_S390_HPP

0 commit comments

Comments
 (0)