--- a/src/hotspot/share/gc/shared/c1/barrierSetC1.cpp	Wed Sep 05 10:39:16 2018 -0700
+++ b/src/hotspot/share/gc/shared/c1/barrierSetC1.cpp	Wed Sep 05 13:10:40 2018 -0700
@@ -321,7 +321,7 @@
       __ cmp(lir_cond_equal, base.result(), LIR_OprFact::oopConst(NULL));
       __ branch(lir_cond_equal, T_OBJECT, cont->label());
     }
-    LIR_Opr src_klass = gen->new_register(T_OBJECT);
+    LIR_Opr src_klass = gen->new_register(T_METADATA);
     if (gen_type_check) {
       // We have determined that offset == referent_offset && src != null.
       // if (src->_klass->_reference_type == REF_NONE) -> continue