|
 |
e6bd67 |
# HG changeset patch
|
|
|
e6bd67 |
# User zgu
|
|
|
e6bd67 |
# Date 1579696811 18000
|
|
|
e6bd67 |
# Wed Jan 22 07:40:11 2020 -0500
|
|
|
e6bd67 |
# Node ID 91ea567eeabeade6b3f8d6cf10c02ba53f700eca
|
|
|
e6bd67 |
# Parent 082f1d3eb1649ff776cda165ed78d65bc7361ebc
|
|
|
e6bd67 |
8237396: JvmtiTagMap::weak_oops_do() should not trigger barriers
|
|
|
e6bd67 |
Reviewed-by: stefank, rkennke
|
|
|
e6bd67 |
|
|
|
e6bd67 |
diff --git a/src/hotspot/share/prims/jvmtiTagMap.cpp b/src/hotspot/share/prims/jvmtiTagMap.cpp
|
|
|
e6bd67 |
--- a/src/hotspot/share/prims/jvmtiTagMap.cpp
|
|
|
e6bd67 |
+++ b/src/hotspot/share/prims/jvmtiTagMap.cpp
|
|
|
e6bd67 |
@@ -1,5 +1,5 @@
|
|
|
e6bd67 |
/*
|
|
|
e6bd67 |
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
|
|
|
e6bd67 |
+ * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
|
|
|
e6bd67 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
|
|
e6bd67 |
*
|
|
|
e6bd67 |
* This code is free software; you can redistribute it and/or modify it
|
|
|
e6bd67 |
@@ -96,6 +96,11 @@
|
|
|
e6bd67 |
inline oop object_peek() {
|
|
|
e6bd67 |
return NativeAccess<ON_PHANTOM_OOP_REF | AS_NO_KEEPALIVE>::oop_load(object_addr());
|
|
|
e6bd67 |
}
|
|
|
e6bd67 |
+
|
|
|
e6bd67 |
+ inline oop object_raw() {
|
|
|
e6bd67 |
+ return RawAccess<>::oop_load(object_addr());
|
|
|
e6bd67 |
+ }
|
|
|
e6bd67 |
+
|
|
|
e6bd67 |
inline jlong tag() const { return _tag; }
|
|
|
e6bd67 |
|
|
|
e6bd67 |
inline void set_tag(jlong tag) {
|
|
|
e6bd67 |
@@ -3357,7 +3362,7 @@
|
|
|
e6bd67 |
JvmtiTagHashmapEntry* next = entry->next();
|
|
|
e6bd67 |
|
|
|
e6bd67 |
// has object been GC'ed
|
|
|
e6bd67 |
- if (!is_alive->do_object_b(entry->object_peek())) {
|
|
|
e6bd67 |
+ if (!is_alive->do_object_b(entry->object_raw())) {
|
|
|
e6bd67 |
// grab the tag
|
|
|
e6bd67 |
jlong tag = entry->tag();
|
|
|
e6bd67 |
guarantee(tag != 0, "checking");
|
|
|
e6bd67 |
@@ -3375,7 +3380,7 @@
|
|
|
e6bd67 |
++freed;
|
|
|
e6bd67 |
} else {
|
|
|
e6bd67 |
f->do_oop(entry->object_addr());
|
|
|
e6bd67 |
- oop new_oop = entry->object_peek();
|
|
|
e6bd67 |
+ oop new_oop = entry->object_raw();
|
|
|
e6bd67 |
|
|
|
e6bd67 |
// if the object has moved then re-hash it and move its
|
|
|
e6bd67 |
// entry to its new location.
|
|
|
e6bd67 |
@@ -3409,7 +3414,7 @@
|
|
|
e6bd67 |
// Re-add all the entries which were kept aside
|
|
|
e6bd67 |
while (delayed_add != NULL) {
|
|
|
e6bd67 |
JvmtiTagHashmapEntry* next = delayed_add->next();
|
|
|
e6bd67 |
- unsigned int pos = JvmtiTagHashmap::hash(delayed_add->object_peek(), size);
|
|
|
e6bd67 |
+ unsigned int pos = JvmtiTagHashmap::hash(delayed_add->object_raw(), size);
|
|
|
e6bd67 |
delayed_add->set_next(table[pos]);
|
|
|
e6bd67 |
table[pos] = delayed_add;
|
|
|
e6bd67 |
delayed_add = next;
|