--- old/src/share/vm/opto/multnode.cpp	2015-10-14 13:54:24.242647085 +0200
+++ new/src/share/vm/opto/multnode.cpp	2015-10-14 13:54:24.134649697 +0200
@@ -31,6 +31,7 @@
 #include "opto/opcodes.hpp"
 #include "opto/phaseX.hpp"
 #include "opto/regmask.hpp"
+#include "opto/shenandoahSupport.hpp"
 #include "opto/type.hpp"
 
 //=============================================================================
@@ -141,6 +142,7 @@
   if (n->is_Mach())    return;  // mach. projs. are not type-safe
   if (n->is_Start())   return;  // alas, starts can have mach. projs. also
   if (_con == SCMemProjNode::SCMEMPROJCON ) return;
+  if (_con == ShenandoahWBMemProjNode::SWBMEMPROJCON ) return;
   const Type* t = n->bottom_type();
   if (t == Type::TOP)  return;  // multi is dead
   assert(_con < t->is_tuple()->cnt(), "ProjNode::_con must be in range");