--- a/src/hotspot/share/runtime/semaphore.hpp	Thu May 17 18:09:19 2018 +0200
+++ b/src/hotspot/share/runtime/semaphore.hpp	Wed May 23 09:42:42 2018 +0200
@@ -57,7 +57,6 @@
 
   bool trywait()              { return _impl.trywait(); }
 
-  void wait_with_safepoint_check();
   void wait_with_safepoint_check(JavaThread* thread);
 };
 

--- a/src/hotspot/share/runtime/semaphore.inline.hpp	Thu May 17 18:09:19 2018 +0200
+++ b/src/hotspot/share/runtime/semaphore.inline.hpp	Wed May 23 09:42:42 2018 +0200
@@ -38,14 +38,4 @@
   _impl.wait();
 }
 
-inline void Semaphore::wait_with_safepoint_check() {
-  Thread* thread = Thread::current();
-  if (thread->is_Java_thread()) {
-    wait_with_safepoint_check(static_cast<JavaThread*>(thread));
-  } else {
-    // Wait for value
-    _impl.wait();
-  }
-}
-
 #endif // SHARE_VM_RUNTIME_SEMAPHORE_INLINE_HPP