Automatic merge of jdk:master into master

Author: duke

src/hotspot/cpu/aarch64/frame_aarch64.cpp

@@ -814,7 +814,6 @@ frame::frame(void* sp, void* fp, void* pc) {
   init((intptr_t*)sp, (intptr_t*)fp, (address)pc);
 }
 
-void frame::pd_ps() {}
 #endif
 
 void JavaFrameAnchor::make_walkable(JavaThread* thread) {

src/hotspot/cpu/arm/frame_arm.cpp

@@ -574,7 +574,6 @@ frame::frame(void* sp, void* fp, void* pc) {
   init((intptr_t*)sp, (intptr_t*)fp, (address)pc);
 }
 
-void frame::pd_ps() {}
 #endif
 
 intptr_t *frame::initial_deoptimization_info() {

src/hotspot/cpu/ppc/frame_ppc.cpp

@@ -387,5 +387,4 @@ frame::frame(void* sp, void* fp, void* pc) : _sp((intptr_t*)sp), _unextended_sp(
   find_codeblob_and_set_pc_and_deopt_state((address)pc); // also sets _fp and adjusts _unextended_sp
 }
 
-void frame::pd_ps() {}
 #endif

src/hotspot/cpu/s390/frame_s390.cpp

@@ -628,8 +628,6 @@ void frame::describe_pd(FrameValues& values, int frame_no) {
   }
 }
 
-
-void frame::pd_ps() {}
 #endif // !PRODUCT
 
 intptr_t *frame::initial_deoptimization_info() {

src/hotspot/cpu/x86/frame_x86.cpp

@@ -718,7 +718,6 @@ frame::frame(void* sp, void* fp, void* pc) {
   init((intptr_t*)sp, (intptr_t*)fp, (address)pc);
 }
 
-void frame::pd_ps() {}
 #endif
 
 void JavaFrameAnchor::make_walkable(JavaThread* thread) {

src/hotspot/cpu/zero/frame_zero.cpp

@@ -396,5 +396,4 @@ frame::frame(void* sp, void* fp, void* pc) {
   Unimplemented();
 }
 
-void frame::pd_ps() {}
 #endif

src/hotspot/share/runtime/frame.hpp

@@ -400,8 +400,6 @@ class frame {
   // Usage:
   // assert(frame::verify_return_pc(return_address), "must be a return pc");
 
-  NOT_PRODUCT(void pd_ps();)  // platform dependent frame printing
-
 #include CPU_HEADER(frame)
 
 };

src/hotspot/share/utilities/debug.cpp

@@ -511,7 +511,6 @@ extern "C" JNIEXPORT void ps() { // print stack
     f = f.sender(&reg_map);
     tty->print("(guessing starting frame id=" PTR_FORMAT " based on current fp)\n", p2i(f.id()));
     p->trace_stack_from(vframe::new_vframe(&f, &reg_map, p));
-    f.pd_ps();
 #endif
   }
 }