--- old/src/hotspot/share/gc/g1/g1ParScanThreadState.inline.hpp	2020-05-14 07:48:27.163276636 -0400
+++ new/src/hotspot/share/gc/g1/g1ParScanThreadState.inline.hpp	2020-05-14 07:48:26.771263621 -0400
@@ -139,7 +139,6 @@
 void G1ParScanThreadState::steal_and_trim_queue(ScannerTasksQueueSet *task_queues) {
   ScannerTask stolen_task;
   while (task_queues->steal(_worker_id, stolen_task)) {
-    verify_task(stolen_task);
     dispatch_task(stolen_task);
 
     // We've just processed a task and we might have made
--- old/src/hotspot/share/gc/shared/taskqueue.hpp	2020-05-14 07:48:28.279313689 -0400
+++ new/src/hotspot/share/gc/shared/taskqueue.hpp	2020-05-14 07:48:27.887300674 -0400
@@ -568,14 +568,14 @@
 // Can be converted to a ScannerTask for placement in associated task queues.
 // Refers to the partially copied source array oop.
 class PartialArrayScanTask {
-  void* _p;
+  oop _src;
 
 public:
-  PartialArrayScanTask() : _p(NULL) {}
-  explicit PartialArrayScanTask(oop src_array) : _p(src_array) {}
+  PartialArrayScanTask() : _src() {}
+  explicit PartialArrayScanTask(oop src_array) : _src(src_array) {}
   // Trivially copyable.
 
-  oop to_source_array() const { return oop(_p); }
+  oop to_source_array() const { return _src; }
 };
 
 // Discriminated union over oop*, narrowOop*, and PartialArrayScanTask.