--- a/hotspot/src/share/vm/memory/metaspace.cpp	Sun Dec 11 12:05:57 2016 -0800
+++ b/hotspot/src/share/vm/memory/metaspace.cpp	Sun Dec 11 19:07:04 2016 -0800
@@ -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"
@@ -3043,6 +3044,7 @@
     assert(!UseSharedSpaces, "Cannot shift with UseSharedSpaces");
     Universe::set_narrow_klass_shift(LogKlassAlignmentInBytes);
   }
+  AOTLoader::set_narrow_klass_shift();
 }
 
 #if INCLUDE_CDS