# HG changeset patch
# User tonyp
# Date 1410342933 -7200
# Node ID fa56205f142c424e5e1ff1e4d88a6551c6c32be1
# Parent  13dbe89e447cc540e5807102bf6c5196b4dabdae
8057799: Unnecessary NULL check in G1KeepAliveClosure
Reviewed-by: tschatzl, stefank

diff -r 13dbe89e447c -r fa56205f142c src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
--- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	Fri Sep 26 20:09:02 2014 -0700
+++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	Wed Sep 10 11:55:33 2014 +0200
@@ -5358,9 +5358,10 @@
   void do_oop(narrowOop* p) { guarantee(false, "Not needed"); }
   void do_oop(oop* p) {
     oop obj = *p;
+    assert(obj != NULL, "the caller should have filtered out NULL values");
 
     G1CollectedHeap::in_cset_state_t cset_state = _g1->in_cset_state(obj);
-    if (obj == NULL || cset_state == G1CollectedHeap::InNeither) {
+    if (cset_state == G1CollectedHeap::InNeither) {
       return;
     }
     if (cset_state == G1CollectedHeap::InCSet) {