--- a/src/hotspot/share/gc/parallel/psTasks.cpp	Mon May 07 14:57:25 2018 +0200
+++ b/src/hotspot/share/gc/parallel/psTasks.cpp	Mon May 07 16:12:07 2018 +0200
@@ -119,11 +119,7 @@
   PSScavengeRootsClosure roots_closure(pm);
   MarkingCodeBlobClosure roots_in_blobs(&roots_closure, CodeBlobToOopClosure::FixRelocations);
 
-  if (_java_thread != NULL)
-    _java_thread->oops_do(&roots_closure, &roots_in_blobs);
-
-  if (_vm_thread != NULL)
-    _vm_thread->oops_do(&roots_closure, &roots_in_blobs);
+  _thread->oops_do(&roots_closure, &roots_in_blobs);
 
   // Do the real work
   pm->drain_stacks(false);