src/hotspot/share/gc/z/zOopClosures.cpp

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.

@@ -37,18 +37,16 @@
   guarantee(ZGlobalPhase == ZPhaseMarkCompleted, "Invalid phase");
   guarantee(!ZResurrection::is_blocked(), "Invalid phase");
 
   const oop o = RawAccess<>::oop_load(p);
   if (o != NULL) {
-    const uintptr_t addr = ZOop::to_address(o);
-    const uintptr_t good_addr = ZAddress::good(addr);
-    guarantee(ZAddress::is_good(addr) || ZAddress::is_finalizable_good(addr),
+    guarantee(ZOop::is_good(o) || ZOop::is_finalizable_good(o),
               "Bad oop " PTR_FORMAT " found at " PTR_FORMAT ", expected " PTR_FORMAT,
-              addr, p2i(p), good_addr);
-    guarantee(oopDesc::is_oop(ZOop::from_address(good_addr)),
+              p2i(o), p2i(p), p2i(ZOop::good(o)));
+    guarantee(oopDesc::is_oop(ZOop::good(o)),
               "Bad object " PTR_FORMAT " found at " PTR_FORMAT,
-              addr, p2i(p));
+              p2i(o), p2i(p));
   }
 }
 
 void ZVerifyOopClosure::do_oop(narrowOop* p) {
   ShouldNotReachHere();