src/hotspot/share/oops/access.hpp

rev 50534 : [mq]: rename_RootAccess
rev 50535 : [mq]: rename_IN_ROOT

*** 119,129 ****
  
    template <DecoratorSet expected_mo_decorators>
    static void verify_heap_oop_decorators() {
      const DecoratorSet heap_oop_decorators = AS_DECORATOR_MASK | ON_DECORATOR_MASK |
                                               OOP_DECORATOR_MASK | (IN_DECORATOR_MASK ^
!                                                                    (IN_ROOT | IN_CONCURRENT_ROOT)); // no root accesses in the heap
      verify_decorators<expected_mo_decorators | heap_oop_decorators>();
    }
  
    static const DecoratorSet load_mo_decorators = MO_UNORDERED | MO_VOLATILE | MO_RELAXED | MO_ACQUIRE | MO_SEQ_CST;
    static const DecoratorSet store_mo_decorators = MO_UNORDERED | MO_VOLATILE | MO_RELAXED | MO_RELEASE | MO_SEQ_CST;
--- 119,129 ----
  
    template <DecoratorSet expected_mo_decorators>
    static void verify_heap_oop_decorators() {
      const DecoratorSet heap_oop_decorators = AS_DECORATOR_MASK | ON_DECORATOR_MASK |
                                               OOP_DECORATOR_MASK | (IN_DECORATOR_MASK ^
!                                                                    (IN_NATIVE | IN_CONCURRENT_ROOT)); // no root accesses in the heap
      verify_decorators<expected_mo_decorators | heap_oop_decorators>();
    }
  
    static const DecoratorSet load_mo_decorators = MO_UNORDERED | MO_VOLATILE | MO_RELAXED | MO_ACQUIRE | MO_SEQ_CST;
    static const DecoratorSet store_mo_decorators = MO_UNORDERED | MO_VOLATILE | MO_RELAXED | MO_RELEASE | MO_SEQ_CST;
*** 294,304 ****
  class HeapAccess: public Access<IN_HEAP | decorators> {};
  
  // Helper for performing normal accesses in roots. These accesses
  // may resolve an accessor on a GC barrier set
  template <DecoratorSet decorators = INTERNAL_EMPTY>
! class RootAccess: public Access<IN_ROOT | decorators> {};
  
  // Helper for array access.
  template <DecoratorSet decorators = INTERNAL_EMPTY>
  class ArrayAccess: public HeapAccess<IN_HEAP_ARRAY | decorators> {
    typedef HeapAccess<IN_HEAP_ARRAY | decorators> AccessT;
--- 294,304 ----
  class HeapAccess: public Access<IN_HEAP | decorators> {};
  
  // Helper for performing normal accesses in roots. These accesses
  // may resolve an accessor on a GC barrier set
  template <DecoratorSet decorators = INTERNAL_EMPTY>
! class NativeAccess: public Access<IN_NATIVE | decorators> {};
  
  // Helper for array access.
  template <DecoratorSet decorators = INTERNAL_EMPTY>
  class ArrayAccess: public HeapAccess<IN_HEAP_ARRAY | decorators> {
    typedef HeapAccess<IN_HEAP_ARRAY | decorators> AccessT;
*** 374,386 ****
      (memory_ordering_decorators ^ MO_RELEASE) == 0 ||
      (memory_ordering_decorators ^ MO_SEQ_CST) == 0
    ));
    const DecoratorSet location_decorators = decorators & IN_DECORATOR_MASK;
    STATIC_ASSERT(location_decorators == 0 || ( // make sure location decorators are disjoint if set
!     (location_decorators ^ IN_ROOT) == 0 ||
      (location_decorators ^ IN_HEAP) == 0 ||
      (location_decorators ^ (IN_HEAP | IN_HEAP_ARRAY)) == 0 ||
!     (location_decorators ^ (IN_ROOT | IN_CONCURRENT_ROOT)) == 0
    ));
  }
  
  #endif // SHARE_OOPS_ACCESS_HPP
--- 374,386 ----
      (memory_ordering_decorators ^ MO_RELEASE) == 0 ||
      (memory_ordering_decorators ^ MO_SEQ_CST) == 0
    ));
    const DecoratorSet location_decorators = decorators & IN_DECORATOR_MASK;
    STATIC_ASSERT(location_decorators == 0 || ( // make sure location decorators are disjoint if set
!     (location_decorators ^ IN_NATIVE) == 0 ||
      (location_decorators ^ IN_HEAP) == 0 ||
      (location_decorators ^ (IN_HEAP | IN_HEAP_ARRAY)) == 0 ||
!     (location_decorators ^ (IN_NATIVE | IN_CONCURRENT_ROOT)) == 0
    ));
  }
  
  #endif // SHARE_OOPS_ACCESS_HPP