--- old/src/share/vm/memory/metaspace.cpp	2016-11-03 14:16:41.000000000 -0700
+++ new/src/share/vm/memory/metaspace.cpp	2016-11-03 14:16:41.000000000 -0700
@@ -22,6 +22,7 @@
  *
  */
 #include "precompiled.hpp"
+#include "aot/aotLoader.hpp"
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/collectorPolicy.hpp"
 #include "gc/shared/gcLocker.hpp"
@@ -3012,6 +3013,7 @@
     assert(!UseSharedSpaces, "Cannot shift with UseSharedSpaces");
     Universe::set_narrow_klass_shift(LogKlassAlignmentInBytes);
   }
+  AOTLoader::set_narrow_klass_shift();
 }
 
 #if INCLUDE_CDS