8318383: Remove duplicated checks in os::get_native_stack() in posix implementation

zhengyu123 · zhengyu123 · commit 9cf334fb6488 · 2023-10-19T13:56:16.000Z
Reviewed-by: dholmes, stuefe
diff --git a/src/hotspot/os/posix/os_posix.cpp b/src/hotspot/os/posix/os_posix.cpp
@@ -156,13 +156,10 @@ int os::get_native_stack(address* stack, int frames, int toSkip) {
       stack[frame_idx ++] = fr.pc();
     }
     if (fr.fp() == nullptr || fr.cb() != nullptr ||
-        fr.sender_pc() == nullptr || os::is_first_C_frame(&fr)) break;
-
-    if (fr.sender_pc() && !os::is_first_C_frame(&fr)) {
-      fr = os::get_sender_for_C_frame(&fr);
-    } else {
+        fr.sender_pc() == nullptr || os::is_first_C_frame(&fr)) {
       break;
     }
+    fr = os::get_sender_for_C_frame(&fr);
   }
   num_of_frames = frame_idx;
   for (; frame_idx < frames; frame_idx ++) {

Original file line number	Diff line number	Diff line change
`@@ -156,13 +156,10 @@ int os::get_native_stack(address* stack, int frames, int toSkip) {`
`156`	`156`	`stack[frame_idx ++] = fr.pc();`
`157`	`157`	`}`
`158`	`158`	`if (fr.fp() == nullptr \|\| fr.cb() != nullptr \|\|`
`159`		`- fr.sender_pc() == nullptr \|\| os::is_first_C_frame(&fr)) break;`
`160`		`-`
`161`		`- if (fr.sender_pc() && !os::is_first_C_frame(&fr)) {`
`162`		`- fr = os::get_sender_for_C_frame(&fr);`
`163`		`- } else {`
	`159`	`+ fr.sender_pc() == nullptr \|\| os::is_first_C_frame(&fr)) {`
`164`	`160`	`break;`
`165`	`161`	`}`
	`162`	`+ fr = os::get_sender_for_C_frame(&fr);`
`166`	`163`	`}`
`167`	`164`	`num_of_frames = frame_idx;`
`168`	`165`	`for (; frame_idx < frames; frame_idx ++) {`