--- a/hotspot/src/share/vm/asm/assembler.cpp	Wed Oct 05 13:35:57 2016 +0200
+++ b/hotspot/src/share/vm/asm/assembler.cpp	Thu Sep 22 18:33:47 2016 +0200
@@ -153,6 +153,8 @@
 
 void Label::add_patch_at(CodeBuffer* cb, int branch_loc) {
   assert(_loc == -1, "Label is unbound");
+  // Don't add patch locations during scratch emit.
+  if (cb->insts()->scratch_emit()) { return; }
   if (_patch_index < PatchCacheSize) {
     _patches[_patch_index] = branch_loc;
   } else {