hg: jdk/hs: 8196876: OopStorage::assert_at_safepoint clashes with assert_at_safepoint macros in g1CollectedHeap.hpp

[kim.barrett at oracle.com]

Changeset: 489f1dd40582
Author:    kbarrett
Date:      2018-03-03 23:56 -0500
URL:       http://hg.openjdk.java.net/jdk/hs/rev/489f1dd40582

8196876: OopStorage::assert_at_safepoint clashes with assert_at_safepoint macros in g1CollectedHeap.hpp
Summary: Add shared safepoint state assertion macros.
Reviewed-by: coleenp, eosterlund

! src/hotspot/share/gc/g1/dirtyCardQueue.cpp
! src/hotspot/share/gc/g1/g1Allocator.cpp
! src/hotspot/share/gc/g1/g1CollectedHeap.cpp
! src/hotspot/share/gc/g1/g1CollectedHeap.hpp
! src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp
! src/hotspot/share/gc/g1/g1CollectionSet.cpp
! src/hotspot/share/gc/g1/g1ConcurrentMark.inline.hpp
! src/hotspot/share/gc/shared/oopStorage.cpp
! src/hotspot/share/gc/shared/oopStorage.hpp
! src/hotspot/share/gc/shared/oopStorage.inline.hpp
! src/hotspot/share/runtime/safepoint.hpp