[8] RFR: Revert ShenandoahVerifyObjectEquals additions, not required after LRB
Roman Kennke
rkennke at redhat.com
Thu Oct 24 09:23:40 UTC 2019
Yes. Oversight on my part.
Thanks,
Roman
> Another leftover in sh/jdk8 that causes bogus testing failures. This reverts oopsHierarchy.hpp to
> upstream state. The flag itself would be removed in a future backport from jdk/jdk.
>
> diff -r b988f0d15442 src/share/vm/oops/oopsHierarchy.hpp
> --- a/src/share/vm/oops/oopsHierarchy.hpp Wed Oct 23 21:15:44 2019 +0200
> +++ b/src/share/vm/oops/oopsHierarchy.hpp Thu Oct 24 10:36:09 2019 +0200
> @@ -28,7 +28,4 @@
> #include "runtime/globals.hpp"
> #include "utilities/globalDefinitions.hpp"
> -#if INCLUDE_ALL_GCS
> -#include "gc_implementation/shenandoah/shenandoah_globals.hpp"
> -#endif
>
> // OBJECT hierarchy
> @@ -103,21 +100,7 @@
> // General access
> oopDesc* operator->() const { return obj(); }
> - bool operator==(const oop o) const {
> -#if INCLUDE_ALL_GCS
> - if (ShenandoahVerifyObjectEquals) {
> - ShouldNotReachHere();
> - }
> -#endif
> - return obj() == o.obj();
> - }
> + 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 {
> -#if INCLUDE_ALL_GCS
> - if (ShenandoahVerifyObjectEquals) {
> - ShouldNotReachHere();
> - }
> -#endif
> - return obj() != o.obj();
> - }
> + bool operator!=(const volatile oop o) const { return obj() != o.obj(); }
> bool operator!=(void *p) const { return obj() != p; }
>
> Testing: build, affected tests with -XX:+ShenandoahVerifyObjectEquals.
>
More information about the shenandoah-dev
mailing list