--- a/hotspot/src/share/vm/runtime/sharedRuntime.cpp	Wed Apr 05 01:11:25 2017 +0000
+++ b/hotspot/src/share/vm/runtime/sharedRuntime.cpp	Wed Apr 05 13:15:44 2017 -0700
@@ -482,7 +482,7 @@
 
   // The fastest case first
   CodeBlob* blob = CodeCache::find_blob(return_address);
-  nmethod* nm = (blob != NULL) ? blob->as_nmethod_or_null() : NULL;
+  CompiledMethod* nm = (blob != NULL) ? blob->as_compiled_method_or_null() : NULL;
   if (nm != NULL) {
     // Set flag if return address is a method handle call site.
     thread->set_is_method_handle_return(nm->is_method_handle_return(return_address));
@@ -506,13 +506,6 @@
     }
   }
 
-#if INCLUDE_AOT
-  if (UseAOT && blob->is_aot()) {
-    // AOT Compiled code
-    return AOTLoader::exception_begin(thread, blob, return_address);
-  }
-#endif
-
   // Entry code
   if (StubRoutines::returns_to_call_stub(return_address)) {
     return StubRoutines::catch_exception_entry();