--- a/src/hotspot/cpu/arm/jniFastGetField_arm.cpp	2019-07-26 13:29:34.569851539 +0300
+++ b/src/hotspot/cpu/arm/jniFastGetField_arm.cpp	2019-07-26 13:31:34.441884864 +0300
@@ -32,7 +32,7 @@
 
 #define __ masm->
 
-#define BUFFER_SIZE  96
+#define BUFFER_SIZE  120
 
 address JNI_FastGetField::generate_fast_get_int_field0(BasicType type) {
   const char* name = NULL;
@@ -114,7 +114,7 @@
 
   if (JvmtiExport::can_post_field_access()) {
     // Using barrier to order wrt. JVMTI check and load of result.
-    __ membar(Assembler::LoadLoad, Rtmp1);
+    __ membar(MacroAssembler::LoadLoad, Rtmp1);
 
     // Check to see if a field access watch has been set before we
     // take the fast path.
@@ -191,7 +191,7 @@
 
   if (JvmtiExport::can_post_field_access()) {
     // Order JVMTI check and load of result wrt. succeeding check.
-    __ membar(Assembler::LoadLoad, Rtmp2);
+    __ membar(MacroAssembler::LoadLoad, Rtmp2);
     __ ldr_s32(Rsafept_cnt2, Address(Rsafepoint_counter_addr));
   } else {
     // Address dependency restricts memory access ordering. It's cheaper than explicit LoadLoad barrier