--- a/src/os/bsd/vm/os_bsd.cpp	Thu Aug 27 18:28:49 2015 +0200
+++ b/src/os/bsd/vm/os_bsd.cpp	Thu Aug 27 13:35:19 2015 -0700
@@ -3834,11 +3834,6 @@
   return fetcher.result();
 }
 
-address os::get_pc(void* context) {
-  ucontext_t *uc = (ucontext_t*)context;
-  return os::Bsd::ucontext_get_pc(uc);
-}
-
 int os::Bsd::safe_cond_timedwait(pthread_cond_t *_cond, pthread_mutex_t *_mutex, const struct timespec *_abstime)
 {
   return pthread_cond_timedwait(_cond, _mutex, _abstime);

--- a/src/os/linux/vm/os_linux.cpp	Thu Aug 27 18:28:49 2015 +0200
+++ b/src/os/linux/vm/os_linux.cpp	Thu Aug 27 13:35:19 2015 -0700
@@ -5031,11 +5031,6 @@
   return fetcher.result();
 }
 
-address os::get_pc(void* context) {
-  ucontext_t *uc = (ucontext_t*)context;
-  return os::Linux::ucontext_get_pc(uc);
-}
-
 int os::Linux::safe_cond_timedwait(pthread_cond_t *_cond, pthread_mutex_t *_mutex, const struct timespec *_abstime)
 {
    if (is_NPTL()) {

--- a/src/os/solaris/vm/os_solaris.cpp	Thu Aug 27 18:28:49 2015 +0200
+++ b/src/os/solaris/vm/os_solaris.cpp	Thu Aug 27 13:35:19 2015 -0700
@@ -4265,11 +4265,6 @@
   return fetcher.result();
 }
 
-address os::get_pc(void* context) {
-  ucontext_t *uc = (ucontext_t*)context;
-  return os::Solaris::ucontext_get_pc(uc);
-}
-
 // This does not do anything on Solaris. This is basically a hook for being
 // able to use structured exception handling (thread-local exception filters) on, e.g., Win32.
 void os::os_exception_wrapper(java_call_t f, JavaValue* value, methodHandle* method, JavaCallArguments* args, Thread* thread) {

--- a/src/os/windows/vm/os_windows.cpp	Thu Aug 27 18:28:49 2015 +0200
+++ b/src/os/windows/vm/os_windows.cpp	Thu Aug 27 13:35:19 2015 -0700
@@ -3710,16 +3710,6 @@
 #endif
 }
 
-address os::get_pc(void* context) {
-  CONTEXT* uc = (CONTEXT*)context;
-#ifdef _M_AMD64
-  return (address) uc->Rip;
-#else
-  return (address) uc->Eip;
-#endif
-}
-
-
 // GetCurrentThreadId() returns DWORD
 intx os::current_thread_id()          { return GetCurrentThreadId(); }
 

--- a/src/share/vm/utilities/vmError.cpp	Thu Aug 27 18:28:49 2015 +0200
+++ b/src/share/vm/utilities/vmError.cpp	Thu Aug 27 13:35:19 2015 -0700
@@ -539,18 +539,17 @@
   STEP(102, "(printing code blob if possible)")
 
      if (_verbose && _context) {
-       address pc = os::get_pc(_context);
-       CodeBlob* cb = CodeCache::find_blob(pc);
+       CodeBlob* cb = CodeCache::find_blob(_pc);
        if (cb != NULL) {
-         if (Interpreter::contains(pc)) {
+         if (Interpreter::contains(_pc)) {
            // The interpreter CodeBlob is very large so try to print the codelet instead.
-           InterpreterCodelet* codelet = Interpreter::codelet_containing(pc);
+           InterpreterCodelet* codelet = Interpreter::codelet_containing(_pc);
            if (codelet != NULL) {
              codelet->print_on(st);
              Disassembler::decode(codelet->code_begin(), codelet->code_end(), st);
            }
          } else {
-           StubCodeDesc* desc = StubCodeDesc::desc_for(pc);
+           StubCodeDesc* desc = StubCodeDesc::desc_for(_pc);
            if (desc != NULL) {
              desc->print_on(st);
              Disassembler::decode(desc->begin(), desc->end(), st);