src/share/vm/prims/jvmtiTagMap.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 2003, 2016, 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.
--- 1,7 ----
  /*
!  * Copyright (c) 2003, 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.
*** 49,58 ****
--- 49,59 ----
  #include "runtime/vmThread.hpp"
  #include "runtime/vm_operations.hpp"
  #include "services/serviceUtil.hpp"
  #include "utilities/macros.hpp"
  #if INCLUDE_ALL_GCS
+ #include "gc/g1/g1SATBCardTableModRefBS.hpp"
  #include "gc/parallel/parallelScavengeHeap.hpp"
  #endif // INCLUDE_ALL_GCS
  
  // JvmtiTagHashmapEntry
  //
*** 1532,1541 ****
--- 1533,1550 ----
    void do_entry(JvmtiTagHashmapEntry* entry) {
      for (int i=0; i<_tag_count; i++) {
        if (_tags[i] == entry->tag()) {
          oop o = entry->object();
          assert(o != NULL && Universe::heap()->is_in_reserved(o), "sanity check");
+ #if INCLUDE_ALL_GCS
+         // We could be accessing the referent field in a reference
+         // object. If G1 is enabled then we need to register non-null
+         // referent with the SATB barrier.
+         if (UseG1GC) {
+           G1SATBCardTableModRefBS::enqueue(o);
+         }
+ #endif
          jobject ref = JNIHandles::make_local(JavaThread::current(), o);
          _object_results->append(ref);
          _tag_results->append((uint64_t)entry->tag());
        }
      }