OpenJDK / jdk / jdk
changeset 56284:272910ccd7bb
8230796: Remove BarrierSet::oop_equals_operator_allowed()
Reviewed-by: tschatzl, shade
| author | pliden |
|---|---|
| date | Tue, 17 Sep 2019 09:51:02 +0200 |
| parents | d349347d6b5f |
| children | 470af058bd5f |
| files | src/hotspot/share/gc/shared/barrierSet.hpp src/hotspot/share/oops/oopsHierarchy.cpp src/hotspot/share/oops/oopsHierarchy.hpp |
| diffstat | 3 files changed, 2 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/share/gc/shared/barrierSet.hpp Fri Sep 13 07:43:59 2019 +0200 +++ b/src/hotspot/share/gc/shared/barrierSet.hpp Tue Sep 17 09:51:02 2019 +0200 @@ -144,10 +144,6 @@ virtual void make_parsable(JavaThread* thread) {} -#ifdef CHECK_UNHANDLED_OOPS - virtual bool oop_equals_operator_allowed() { return true; } -#endif - public: // Print a description of the memory for the barrier set virtual void print_on(outputStream* st) const = 0;
--- a/src/hotspot/share/oops/oopsHierarchy.cpp Fri Sep 13 07:43:59 2019 +0200 +++ b/src/hotspot/share/oops/oopsHierarchy.cpp Tue Sep 17 09:51:02 2019 +0200 @@ -23,9 +23,6 @@ */ #include "precompiled.hpp" -#include "gc/shared/barrierSet.hpp" -#include "gc/shared/collectedHeap.hpp" -#include "gc/shared/collectedHeap.inline.hpp" #include "memory/universe.hpp" #include "oops/oopsHierarchy.hpp" #include "runtime/thread.inline.hpp" @@ -56,14 +53,4 @@ } } -bool oop::operator==(const oop o) const { - assert(BarrierSet::barrier_set()->oop_equals_operator_allowed(), "Not allowed"); - return obj() == o.obj(); -} - -bool oop::operator!=(const volatile oop o) const { - assert(BarrierSet::barrier_set()->oop_equals_operator_allowed(), "Not allowed"); - return obj() != o.obj(); -} - #endif // CHECK_UNHANDLED_OOPS
--- a/src/hotspot/share/oops/oopsHierarchy.hpp Fri Sep 13 07:43:59 2019 +0200 +++ b/src/hotspot/share/oops/oopsHierarchy.hpp Tue Sep 17 09:51:02 2019 +0200 @@ -100,9 +100,9 @@ // General access oopDesc* operator->() const { return obj(); } - bool operator==(const oop o) const; + bool operator==(const oop o) const { return obj() == o.obj(); } bool operator==(void *p) const { return obj() == p; } - bool operator!=(const volatile oop o) const; + bool operator!=(const volatile oop o) const { return obj() != o.obj(); } bool operator!=(void *p) const { return obj() != p; } // Assignment