--- a/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp	Wed Mar 13 12:30:20 2019 -0700
+++ b/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp	Wed Mar 13 21:01:56 2019 +0100
@@ -47,7 +47,7 @@
 
 template <DecoratorSet decorators, typename T>
 inline void G1BarrierSet::write_ref_field_post(T* field, oop new_val) {
-  volatile jbyte* byte = _card_table->byte_for(field);
+  volatile CardValue* byte = _card_table->byte_for(field);
   if (*byte != G1CardTable::g1_young_card_val()) {
     // Take a slow path for cards in old
     write_ref_field_post_slow(byte);