*** old/src/hotspot/share/memory/universe.cpp	Thu Apr 19 14:48:12 2018
--- new/src/hotspot/share/memory/universe.cpp	Thu Apr 19 14:48:12 2018

*** 784,793 ****
--- 784,794 ----
      }
      if ((uint64_t)Universe::heap()->reserved_region().end() <= OopEncodingHeapMax) {
        // Did reserve heap below 32Gb. Can use base == 0;
        Universe::set_narrow_oop_base(0);
      }
+     AOTLoader::set_narrow_oop_shift();
  
      Universe::set_narrow_ptrs_base(Universe::narrow_oop_base());
  
      LogTarget(Info, gc, heap, coops) lt;
      if (lt.is_enabled()) {