--- a/hotspot/src/cpu/x86/vm/frame_x86.cpp	Sun Jan 22 22:18:49 2017 -0800
+++ b/hotspot/src/cpu/x86/vm/frame_x86.cpp	Mon Jan 23 09:53:27 2017 +0100
@@ -376,7 +376,8 @@
   fr._unextended_sp = unextended_sp;
 
   address original_pc = nm->get_original_pc(&fr);
-  assert(nm->insts_contains(original_pc), "original PC must be in CompiledMethod");
+  assert(nm->insts_contains_inclusive(original_pc),
+         "original PC must be in the main code section of the the compiled method (or must be immediately following it)");
 }
 #endif