--- a/hotspot/src/share/vm/gc/g1/g1ParScanThreadState.cpp	Thu Feb 23 10:18:21 2017 +0100
+++ b/hotspot/src/share/vm/gc/g1/g1ParScanThreadState.cpp	Thu Feb 23 10:19:05 2017 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -113,7 +113,7 @@
   if (has_partial_array_mask(ref)) {
     // Must be in the collection set--it's already been copied.
     oop p = clear_partial_array_mask(ref);
-    assert(_g1h->obj_in_cs(p),
+    assert(_g1h->is_in_cset(p),
            "ref=" PTR_FORMAT " p=" PTR_FORMAT, p2i(ref), p2i(p));
   } else {
     oop p = oopDesc::load_decode_heap_oop(ref);
@@ -372,7 +372,7 @@
 }
 
 oop G1ParScanThreadState::handle_evacuation_failure_par(oop old, markOop m) {
-  assert(_g1h->obj_in_cs(old), "Object " PTR_FORMAT " should be in the CSet", p2i(old));
+  assert(_g1h->is_in_cset(old), "Object " PTR_FORMAT " should be in the CSet", p2i(old));
 
   oop forward_ptr = old->forward_to_atomic(old);
   if (forward_ptr == NULL) {
@@ -394,7 +394,7 @@
     // Forward-to-self failed. Either someone else managed to allocate
     // space for this object (old != forward_ptr) or they beat us in
     // self-forwarding it (old == forward_ptr).
-    assert(old == forward_ptr || !_g1h->obj_in_cs(forward_ptr),
+    assert(old == forward_ptr || !_g1h->is_in_cset(forward_ptr),
            "Object " PTR_FORMAT " forwarded to: " PTR_FORMAT " "
            "should not be in the CSet",
            p2i(old), p2i(forward_ptr));