--- a/src/hotspot/share/runtime/handles.cpp	Fri Nov 03 17:09:25 2017 -0700
+++ b/src/hotspot/share/runtime/handles.cpp	Sun Nov 05 03:43:15 2017 +0100
@@ -99,7 +99,7 @@
   while (bottom < top) {
     // This test can be moved up but for now check every oop.
 
-    assert(oopDesc::is_oop(*bottom), "handle should point to oop");
+    assert(oopDesc::is_oop(*bottom, true), "handle should point to oop");
 
     f->do_oop(bottom++);
   }

--- a/src/hotspot/share/runtime/mutexLocker.cpp	Fri Nov 03 17:09:25 2017 -0700
+++ b/src/hotspot/share/runtime/mutexLocker.cpp	Sun Nov 05 03:43:15 2017 +0100
@@ -129,7 +129,6 @@
 Monitor* JfrMsg_lock                  = NULL;
 Mutex*   JfrBuffer_lock               = NULL;
 Mutex*   JfrStream_lock               = NULL;
-Mutex*   JfrThreadGroups_lock         = NULL;
 #endif
 
 #ifndef SUPPORTS_NATIVE_CX8
@@ -280,7 +279,6 @@
 #if INCLUDE_TRACE
   def(JfrMsg_lock                  , PaddedMonitor, leaf,        true,  Monitor::_safepoint_check_always);
   def(JfrBuffer_lock               , PaddedMutex  , leaf,        true,  Monitor::_safepoint_check_never);
-  def(JfrThreadGroups_lock         , PaddedMutex  , leaf,        true,  Monitor::_safepoint_check_always);
   def(JfrStream_lock               , PaddedMutex  , leaf+1,      true,  Monitor::_safepoint_check_never);      // ensure to rank lower than 'safepoint'
   def(JfrStacktrace_lock           , PaddedMutex  , special,     true,  Monitor::_safepoint_check_sometimes);
 #endif

--- a/src/hotspot/share/runtime/mutexLocker.hpp	Fri Nov 03 17:09:25 2017 -0700
+++ b/src/hotspot/share/runtime/mutexLocker.hpp	Sun Nov 05 03:43:15 2017 +0100
@@ -128,7 +128,6 @@
 extern Monitor* JfrMsg_lock;                     // protects JFR messaging
 extern Mutex*   JfrBuffer_lock;                  // protects JFR buffer operations
 extern Mutex*   JfrStream_lock;                  // protects JFR stream access
-extern Mutex*   JfrThreadGroups_lock;            // protects JFR access to Thread Groups
 #endif
 
 #ifndef SUPPORTS_NATIVE_CX8

--- a/src/hotspot/share/utilities/growableArray.hpp	Fri Nov 03 17:09:25 2017 -0700
+++ b/src/hotspot/share/utilities/growableArray.hpp	Sun Nov 05 03:43:15 2017 +0100
@@ -402,7 +402,7 @@
   // matching key according to the static compare function.  Insert
   // that element is not already in the list.  Assumes the list is
   // already sorted according to compare function.
-  template <int compare(const E&, const E&)> E insert_sorted(E& key) {
+  template <int compare(const E&, const E&)> E insert_sorted(const E& key) {
     bool found;
     int location = find_sorted<E, compare>(key, found);
     if (!found) {