--- a/hotspot/src/share/vm/shark/sharkBuilder.cpp	Fri Aug 28 11:10:57 2015 +0200
+++ b/hotspot/src/share/vm/shark/sharkBuilder.cpp	Tue Aug 18 17:48:35 2015 -0400
@@ -440,8 +440,10 @@
 // HotSpot memory barriers
 
 void SharkBuilder::CreateUpdateBarrierSet(BarrierSet* bs, Value* field) {
-  if (bs->kind() != BarrierSet::CardTableModRef)
+  if (bs->kind() != BarrierSet::CardTableForRS &&
+      bs->kind() != BarrierSet::CardTableExtension) {
     Unimplemented();
+  }
 
   CreateStore(
     LLVMValue::jbyte_constant(CardTableModRefBS::dirty_card_val()),