diff -r 24ebaf9d7198 -r fb290fd1f9d4 src/hotspot/share/oops/method.cpp
--- a/src/hotspot/share/oops/method.cpp	Wed Oct 18 16:06:39 2017 +0200
+++ b/src/hotspot/share/oops/method.cpp	Sun Oct 15 22:54:03 2017 +0200
@@ -1165,15 +1165,11 @@
   }
 
   OrderAccess::storestore();
-#ifdef SHARK
-  mh->_from_interpreted_entry = code->insts_begin();
-#else //!SHARK
   mh->_from_compiled_entry = code->verified_entry_point();
   OrderAccess::storestore();
   // Instantly compiled code can execute.
   if (!mh->is_method_handle_intrinsic())
     mh->_from_interpreted_entry = mh->get_i2c_entry();
-#endif //!SHARK
 }