--- old/src/share/vm/memory/metaspace.cpp	2016-10-31 17:46:56.000000000 -0700
+++ new/src/share/vm/memory/metaspace.cpp	2016-10-31 17:46:56.000000000 -0700
@@ -48,6 +48,7 @@
 #include "utilities/copy.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/macros.hpp"
+#include "aot/aotLoader.hpp"
 
 typedef BinaryTreeDictionary<Metablock, FreeList<Metablock> > BlockTreeDictionary;
 typedef BinaryTreeDictionary<Metachunk, FreeList<Metachunk> > ChunkTreeDictionary;
@@ -3012,6 +3013,7 @@
     assert(!UseSharedSpaces, "Cannot shift with UseSharedSpaces");
     Universe::set_narrow_klass_shift(LogKlassAlignmentInBytes);
   }
+  AOTLoader::set_narrow_klass_shift();
 }
 
 #if INCLUDE_CDS