src/hotspot/share/jfr/leakprofiler/checkpoint/eventEmitter.cpp

@@ -1,7 +1,7 @@
  /*
-  * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+  * Copyright (c) 2019, 2021, 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.

@@ -118,11 +118,11 @@
  void EventEmitter::link_sample_with_edge(const ObjectSample* sample, EdgeStore* edge_store) {
    assert(sample != NULL, "invariant");
    assert(!sample->is_dead(), "invariant");
    assert(edge_store != NULL, "invariant");
    if (SafepointSynchronize::is_at_safepoint()) {
-     if (!sample->object()->mark().is_marked()) {
+     if (edge_store->has_leak_context(sample)) {
        // Associated with an edge (chain) already during heap traversal.
        return;
      }
    }
    // In order to dump out a representation of the event

@@ -135,25 +135,16 @@
    assert(sample != NULL, "invariant");
    assert(!sample->is_dead(), "invariant");
    assert(edge_store != NULL, "invariant");
    assert(_jfr_thread_local != NULL, "invariant");
  
-   traceid gc_root_id = 0;
-   const Edge* edge = NULL;
-   if (SafepointSynchronize::is_at_safepoint()) {
-     if (!sample->object()->mark().is_marked()) {
-       edge = (const Edge*)(sample->object())->mark().to_pointer();
-     }
-   }
-   if (edge == NULL) {
-     edge = edge_store->get(UnifiedOopRef::encode_in_native(sample->object_addr()));
-   } else {
-     gc_root_id = edge_store->gc_root_id(edge);
-   }
+   const StoredEdge* const edge = edge_store->get(sample);
    assert(edge != NULL, "invariant");
+   assert(edge->pointee() == sample->object(), "invariant");
    const traceid object_id = edge_store->get_id(edge);
    assert(object_id != 0, "invariant");
+   const traceid gc_root_id = edge->gc_root_id();
  
    Tickspan object_age = Ticks(_start_time.value()) - sample->allocation_time();
  
    EventOldObjectSample e(UNTIMED);
    e.set_starttime(_start_time);