diff -r 6bdc0c9c44af -r bed18a111b90 hotspot/src/share/vm/runtime/thread.hpp
--- a/hotspot/src/share/vm/runtime/thread.hpp	Thu Aug 31 17:06:10 2017 +0000
+++ b/hotspot/src/share/vm/runtime/thread.hpp	Thu Aug 31 20:26:53 2017 -0500
@@ -56,7 +56,6 @@
 #endif
 
 class ThreadSafepointState;
-class ThreadProfiler;
 
 class JvmtiThreadState;
 class JvmtiGetLoadedClassesClosure;
@@ -1720,23 +1719,6 @@
 
   void deoptimized_wrt_marked_nmethods();
 
-  // Profiling operation (see fprofile.cpp)
- public:
-  bool profile_last_Java_frame(frame* fr);
-
- private:
-  ThreadProfiler* _thread_profiler;
- private:
-  friend class FlatProfiler;                    // uses both [gs]et_thread_profiler.
-  friend class FlatProfilerTask;                // uses get_thread_profiler.
-  friend class ThreadProfilerMark;              // uses get_thread_profiler.
-  ThreadProfiler* get_thread_profiler()         { return _thread_profiler; }
-  ThreadProfiler* set_thread_profiler(ThreadProfiler* tp) {
-    ThreadProfiler* result = _thread_profiler;
-    _thread_profiler = tp;
-    return result;
-  }
-
  public:
   // Returns the running thread as a JavaThread
   static inline JavaThread* current();