--- a/hotspot/src/share/vm/shark/sharkRuntime.cpp	Tue Nov 10 21:09:49 2015 +0300
+++ b/hotspot/src/share/vm/shark/sharkRuntime.cpp	Wed Nov 11 14:40:38 2015 -1000
@@ -213,8 +213,9 @@
   // Initiate the trap
   thread->set_last_Java_frame();
   Deoptimization::UnrollBlock *urb =
-    Deoptimization::uncommon_trap(thread, trap_request);
+    Deoptimization::uncommon_trap(thread, trap_request, Deoptimization::Unpack_uncommon_trap);
   thread->reset_last_Java_frame();
+  assert(urb->unpack_kind() == Deoptimization::Unpack_uncommon_trap, "expected Unpack_uncommon_trap");
 
   // Pop our dummy frame and the frame being deoptimized
   thread->pop_zero_frame();