--- old/src/share/vm/opto/output.cpp	2016-11-03 14:16:46.000000000 -0700
+++ new/src/share/vm/opto/output.cpp	2016-11-03 14:16:46.000000000 -0700
@@ -292,6 +292,10 @@
           if (mcall->is_MachCallJava() && mcall->as_MachCallJava()->_method) {
             stub_size  += CompiledStaticCall::to_interp_stub_size();
             reloc_size += CompiledStaticCall::reloc_to_interp_stub();
+#if INCLUDE_AOT
+            stub_size  += CompiledStaticCall::to_aot_stub_size();
+            reloc_size += CompiledStaticCall::reloc_to_aot_stub();
+#endif
           }
         } else if (mach->is_MachSafePoint()) {
           // If call/safepoint are adjacent, account for possible