# HG changeset patch
# Parent  09cacb475999aacff2cad6cd4bac6eeb9df86cc6

diff -r 09cacb475999 -r 4b96747d8f70 src/hotspot/cpu/arm/templateTable_arm.cpp
--- a/src/hotspot/cpu/arm/templateTable_arm.cpp	Wed May 02 11:18:47 2018 +0200
+++ b/src/hotspot/cpu/arm/templateTable_arm.cpp	Wed May 02 15:42:22 2018 +0200
@@ -192,14 +192,18 @@
                          DecoratorSet decorators = 0) {
 
   assert_different_registers(obj.base(), new_val, tmp1, tmp2, tmp3, noreg);
-  __ store_heap_oop(obj, new_val, tmp1, tmp2, tmp3, is_null);
+  if (is_null) {
+    __ store_heap_oop_null(obj, new_val, tmp1, tmp2, tmp3, decorators);
+  } else {
+    __ store_heap_oop(obj, new_val, tmp1, tmp2, tmp3, decorators);
+  }
 }
 
 static void do_oop_load(InterpreterMacroAssembler* _masm,
                         Register dst,
                         Address obj,
                         DecoratorSet decorators = 0) {
-  __ load_heap_oop(dst, obj, noreg, noreg, noreg);
+  __ load_heap_oop(dst, obj, noreg, noreg, noreg, decorators);
 }
 
 Address TemplateTable::at_bcp(int offset) {