diff --git a/src/share/vm/prims/jvmtiEnvBase.hpp b/src/share/vm/prims/jvmtiEnvBase.hpp index 55ea70ab39e8056a2f177f34ccab50ee69cb9aeb..c6a7db18756c5be9ba24cefa78e8a4039adaf2bd 100644 --- a/src/share/vm/prims/jvmtiEnvBase.hpp +++ b/src/share/vm/prims/jvmtiEnvBase.hpp @@ -252,7 +252,7 @@ class JvmtiEnvBase : public CHeapObj { return _tag_map; } - JvmtiTagMap* acquire_tag_map() { + JvmtiTagMap* tag_map_acquire() { return (JvmtiTagMap*)OrderAccess::load_ptr_acquire(&_tag_map); } diff --git a/src/share/vm/prims/jvmtiTagMap.cpp b/src/share/vm/prims/jvmtiTagMap.cpp index 6902f95a80cc208b67d70853b74a64547b7c7e2e..ba48fc3ef1c903b7e6ebf07659a8fe582dea195c 100644 --- a/src/share/vm/prims/jvmtiTagMap.cpp +++ b/src/share/vm/prims/jvmtiTagMap.cpp @@ -499,7 +499,7 @@ void JvmtiTagMap::destroy_entry(JvmtiTagHashmapEntry* entry) { // returns the tag map for the given environments. If the tag map // doesn't exist then it is created. JvmtiTagMap* JvmtiTagMap::tag_map_for(JvmtiEnv* env) { - JvmtiTagMap* tag_map = ((JvmtiEnvBase*)env)->acquire_tag_map(); + JvmtiTagMap* tag_map = ((JvmtiEnvBase*)env)->tag_map_acquire(); if (tag_map == NULL) { MutexLocker mu(JvmtiThreadState_lock); tag_map = ((JvmtiEnvBase*)env)->tag_map(); @@ -3282,7 +3282,7 @@ void JvmtiTagMap::weak_oops_do(BoolObjectClosure* is_alive, OopClosure* f) { if (JvmtiEnv::environments_might_exist()) { JvmtiEnvIterator it; for (JvmtiEnvBase* env = it.first(); env != NULL; env = it.next(env)) { - JvmtiTagMap* tag_map = env->acquire_tag_map(); + JvmtiTagMap* tag_map = env->tag_map_acquire(); if (tag_map != NULL && !tag_map->is_empty()) { tag_map->do_weak_oops(is_alive, f); }