diff -r 6470230caf2a -r 9ffa0d7ed932 src/os_cpu/linux_x86/vm/thread_linux_x86.hpp
--- a/src/os_cpu/linux_x86/vm/thread_linux_x86.hpp	Mon Jun 19 22:49:52 2017 +0000
+++ b/src/os_cpu/linux_x86/vm/thread_linux_x86.hpp	Mon Jun 26 02:04:40 2017 -0700
@@ -32,12 +32,8 @@
 
   frame pd_last_frame() {
     assert(has_last_Java_frame(), "must have last_Java_sp() when suspended");
-    if (_anchor.last_Java_pc() != NULL) {
-      return frame(_anchor.last_Java_sp(), _anchor.last_Java_fp(), _anchor.last_Java_pc());
-    } else {
-      // This will pick up pc from sp
-      return frame(_anchor.last_Java_sp(), _anchor.last_Java_fp());
-    }
+    assert(_anchor.last_Java_pc() != NULL, "not walkable");
+    return frame(_anchor.last_Java_sp(), _anchor.last_Java_fp(), _anchor.last_Java_pc());
   }
 
  public: