--- a/src/hotspot/cpu/ppc/methodHandles_ppc.cpp	Fri Jun 22 16:06:43 2018 -0400
+++ b/src/hotspot/cpu/ppc/methodHandles_ppc.cpp	Fri Jun 22 17:46:58 2018 -0400
@@ -174,13 +174,13 @@
   // Load the invoker, as MH -> MH.form -> LF.vmentry
   __ verify_oop(recv);
   __ load_heap_oop(method_temp, NONZERO(java_lang_invoke_MethodHandle::form_offset_in_bytes()), recv,
-                   temp2, noreg, false, OOP_NOT_NULL);
+                   temp2, noreg, false, IS_NOT_NULL);
   __ verify_oop(method_temp);
   __ load_heap_oop(method_temp, NONZERO(java_lang_invoke_LambdaForm::vmentry_offset_in_bytes()), method_temp,
-                   temp2, noreg, false, OOP_NOT_NULL);
+                   temp2, noreg, false, IS_NOT_NULL);
   __ verify_oop(method_temp);
   __ load_heap_oop(method_temp, NONZERO(java_lang_invoke_MemberName::method_offset_in_bytes()), method_temp,
-                   temp2, noreg, false, OOP_NOT_NULL);
+                   temp2, noreg, false, IS_NOT_NULL);
   __ verify_oop(method_temp);
   __ ld(method_temp, NONZERO(java_lang_invoke_ResolvedMethodName::vmtarget_offset_in_bytes()), method_temp);
 
@@ -342,7 +342,7 @@
         Label L_ok;
         Register temp2_defc = temp2;
         __ load_heap_oop(temp2_defc, NONZERO(java_lang_invoke_MemberName::clazz_offset_in_bytes()), member_reg,
-                         temp3, noreg, false, OOP_NOT_NULL);
+                         temp3, noreg, false, IS_NOT_NULL);
         load_klass_from_Class(_masm, temp2_defc, temp3, temp4);
         __ verify_klass_ptr(temp2_defc);
         __ check_klass_subtype(temp1_recv_klass, temp2_defc, temp3, temp4, L_ok);
@@ -370,7 +370,7 @@
         verify_ref_kind(_masm, JVM_REF_invokeSpecial, member_reg, temp2);
       }
       __ load_heap_oop(R19_method, NONZERO(java_lang_invoke_MemberName::method_offset_in_bytes()), member_reg,
-                       temp3, noreg, false, OOP_NOT_NULL);
+                       temp3, noreg, false, IS_NOT_NULL);
       __ ld(R19_method, NONZERO(java_lang_invoke_ResolvedMethodName::vmtarget_offset_in_bytes()), R19_method);
       break;
 
@@ -379,7 +379,7 @@
         verify_ref_kind(_masm, JVM_REF_invokeStatic, member_reg, temp2);
       }
       __ load_heap_oop(R19_method, NONZERO(java_lang_invoke_MemberName::method_offset_in_bytes()), member_reg,
-                       temp3, noreg, false, OOP_NOT_NULL);
+                       temp3, noreg, false, IS_NOT_NULL);
       __ ld(R19_method, NONZERO(java_lang_invoke_ResolvedMethodName::vmtarget_offset_in_bytes()), R19_method);
       break;
 
@@ -422,7 +422,7 @@
 
       Register temp2_intf = temp2;
       __ load_heap_oop(temp2_intf, NONZERO(java_lang_invoke_MemberName::clazz_offset_in_bytes()), member_reg,
-                       temp3, noreg, false, OOP_NOT_NULL);
+                       temp3, noreg, false, IS_NOT_NULL);
       load_klass_from_Class(_masm, temp2_intf, temp3, temp4);
       __ verify_klass_ptr(temp2_intf);