From 7433d3a21a2201d06bafae08ce77e6cf424baf75 Mon Sep 17 00:00:00 2001
From: tonyp <unknown>
Date: Wed, 10 Sep 2014 11:55:33 +0200
Subject: [PATCH] 8057799: Unnecessary NULL check in G1KeepAliveClosure
 Reviewed-by: tschatzl, stefank

---
 src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp b/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
index 3f18304db..561aba5eb 100644
--- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
+++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
@@ -5358,9 +5358,10 @@ public:
   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) {
-- 
GitLab