--- a/src/hotspot/cpu/x86/assembler_x86.cpp	Thu Apr 11 12:06:58 2019 -0700
+++ b/src/hotspot/cpu/x86/assembler_x86.cpp	Thu Apr 11 19:36:00 2019 -0400
@@ -3099,7 +3099,7 @@
     }
     return;
   }
-  if (UseAddressNop && VM_Version::is_amd()) {
+  if (UseAddressNop && VM_Version::is_amd_family()) {
     //
     // Using multi-bytes nops "0x0F 0x1F [address]" for AMD.
     //  1: 0x90