--- old/src/hotspot/cpu/x86/x86_64.ad	2018-12-18 10:43:03.851320519 +0100
+++ new/src/hotspot/cpu/x86/x86_64.ad	2018-12-18 10:43:03.602309859 +0100
@@ -12694,7 +12694,7 @@
          KILL x8, KILL x9, KILL x10, KILL x11,
          KILL x12, KILL x13, KILL x14, KILL x15);
 
-  format %{"LoadBarrierSlowRegXmm $dst, $mem" %}
+  format %{"LoadBarrierSlowRegXmmAndYmm $dst, $mem" %}
   ins_encode %{
 #if INCLUDE_ZGC
     Register d = $dst$$Register;
@@ -12763,12 +12763,12 @@
 // When running without XMM regs
 instruct loadBarrierWeakSlowRegNoVec(rRegP dst, memory mem, rFlagsReg cr) %{
 
-  match(Set dst (LoadBarrierSlowReg mem));
+  match(Set dst (LoadBarrierWeakSlowReg mem));
   predicate(MaxVectorSize < 16);
 
   effect(DEF dst, KILL cr);
 
-  format %{"LoadBarrierSlowRegNoVec $dst, $mem" %}
+  format %{"LoadBarrierWeakSlowRegNoVec $dst, $mem" %}
   ins_encode %{
 #if INCLUDE_ZGC
     Register d = $dst$$Register;
@@ -12803,7 +12803,7 @@
          KILL x8, KILL x9, KILL x10, KILL x11,
          KILL x12, KILL x13, KILL x14, KILL x15);
 
-  format %{"LoadBarrierWeakSlowRegXmm $dst, $mem" %}
+  format %{"LoadBarrierWeakSlowRegXmmAndYmm $dst, $mem" %}
   ins_encode %{
 #if INCLUDE_ZGC
     Register d = $dst$$Register;