--- a/hotspot/src/share/vm/gc/g1/g1HotCardCache.hpp	Fri Dec 04 04:29:31 2015 +0000
+++ b/hotspot/src/share/vm/gc/g1/g1HotCardCache.hpp	Fri Dec 04 04:06:37 2015 -0500
@@ -123,7 +123,7 @@
   // Resets the hot card cache and discards the entries.
   void reset_hot_cache() {
     assert(SafepointSynchronize::is_at_safepoint(), "Should be at a safepoint");
-    assert(Thread::current_noinline()->is_VM_thread(), "Current thread should be the VMthread");
+    assert(Thread::current()->is_VM_thread(), "Current thread should be the VMthread");
     if (default_use_cache()) {
         reset_hot_cache_internal();
     }