--- old/src/share/vm/gc/cms/vmCMSOperations.cpp	2016-03-15 11:55:25.091897173 +0100
+++ new/src/share/vm/gc/cms/vmCMSOperations.cpp	2016-03-15 11:55:24.949891221 +0100
@@ -85,7 +85,7 @@
   assert(!ConcurrentMarkSweepThread::cms_thread_has_cms_token(),
          "Possible deadlock");
 
-  if (needs_pll()) {
+  if (needs_pending_list_lock()) {
     acquire_pending_list_lock();
   }
   // Get the Heap_lock after the pending_list_lock.
@@ -93,7 +93,7 @@
   if (lost_race()) {
     assert(_prologue_succeeded == false, "Initialized in c'tor");
     Heap_lock->unlock();
-    if (needs_pll()) {
+    if (needs_pending_list_lock()) {
       release_and_notify_pending_list_lock();
     }
   } else {
@@ -110,7 +110,7 @@
 
   // Release the Heap_lock first.
   Heap_lock->unlock();
-  if (needs_pll()) {
+  if (needs_pending_list_lock()) {
     release_and_notify_pending_list_lock();
   }
 }
--- old/src/share/vm/gc/cms/vmCMSOperations.hpp	2016-03-15 11:55:25.271904717 +0100
+++ new/src/share/vm/gc/cms/vmCMSOperations.hpp	2016-03-15 11:55:25.159900023 +0100
@@ -77,7 +77,7 @@
   virtual const CMSCollector::CollectorState legal_state() const = 0;
 
   // Whether the pending list lock needs to be held
-  virtual const bool needs_pll() const = 0;
+  virtual const bool needs_pending_list_lock() const = 0;
 
   // Execute operations in the context of the caller,
   // prior to execution of the vm operation itself.
@@ -109,7 +109,7 @@
     return CMSCollector::InitialMarking;
   }
 
-  virtual const bool needs_pll() const {
+  virtual const bool needs_pending_list_lock() const {
     return false;
   }
 };
@@ -126,7 +126,7 @@
     return CMSCollector::FinalMarking;
   }
 
-  virtual const bool needs_pll() const {
+  virtual const bool needs_pending_list_lock() const {
     return true;
   }
 };
--- old/src/share/vm/gc/g1/vm_operations_g1.cpp	2016-03-15 11:55:25.478913393 +0100
+++ new/src/share/vm/gc/g1/vm_operations_g1.cpp	2016-03-15 11:55:25.346907861 +0100
@@ -205,12 +205,10 @@
 }
 
 void VM_CGC_Operation::acquire_pending_list_lock() {
-  assert(_needs_pending_list_lock, "don't call this otherwise");
   _pending_list_locker.lock();
 }
 
 void VM_CGC_Operation::release_and_notify_pending_list_lock() {
-  assert(_needs_pending_list_lock, "don't call this otherwise");
   _pending_list_locker.unlock();
 }
 
--- old/src/share/vm/oops/instanceRefKlass.cpp	2016-03-15 11:55:25.671921482 +0100
+++ new/src/share/vm/oops/instanceRefKlass.cpp	2016-03-15 11:55:25.558916746 +0100
@@ -25,13 +25,8 @@
 #include "precompiled.hpp"
 #include "classfile/javaClasses.hpp"
 #include "classfile/systemDictionary.hpp"
-#include "gc/shared/collectedHeap.inline.hpp"
-#include "gc/shared/genCollectedHeap.hpp"
-#include "gc/shared/specialized_oop_closures.hpp"
 #include "oops/instanceRefKlass.inline.hpp"
 #include "oops/oop.inline.hpp"
-#include "utilities/macros.hpp"
-#include "utilities/preserveException.hpp"
 
 void InstanceRefKlass::update_nonstatic_oop_maps(Klass* k) {
   // Clear the nonstatic oop-map entries corresponding to referent