src/share/vm/asm/assembler.cpp

rev 12854 : [mq]: gcinterface.patch

*** 301,311 ****
  bool MacroAssembler::needs_explicit_null_check(intptr_t offset) {
    // Exception handler checks the nmethod's implicit null checks table
    // only when this method returns false.
  #ifdef _LP64
    if (UseCompressedOops && Universe::narrow_oop_base() != NULL) {
!     assert (Universe::heap() != NULL, "java heap should be initialized");
      // The first page after heap_base is unmapped and
      // the 'offset' is equal to [heap_base + offset] for
      // narrow oop implicit null checks.
      uintptr_t base = (uintptr_t)Universe::narrow_oop_base();
      if ((uintptr_t)offset >= base) {
--- 301,311 ----
  bool MacroAssembler::needs_explicit_null_check(intptr_t offset) {
    // Exception handler checks the nmethod's implicit null checks table
    // only when this method returns false.
  #ifdef _LP64
    if (UseCompressedOops && Universe::narrow_oop_base() != NULL) {
!     assert (GC::gc()->heap() != NULL, "java heap should be initialized");
      // The first page after heap_base is unmapped and
      // the 'offset' is equal to [heap_base + offset] for
      // narrow oop implicit null checks.
      uintptr_t base = (uintptr_t)Universe::narrow_oop_base();
      if ((uintptr_t)offset >= base) {