--- old/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp 2019-01-24 17:46:54.371574859 +0000 +++ new/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp 2019-01-24 17:46:53.683544284 +0000 @@ -35,6 +35,7 @@ #include "oops/markOop.hpp" #include "oops/method.hpp" #include "oops/methodData.hpp" +#include "oops/valueKlass.hpp" #include "prims/jvmtiExport.hpp" #include "prims/jvmtiThreadState.hpp" #include "runtime/basicLock.hpp" @@ -672,6 +673,8 @@ bind(no_reserved_zone_enabling); } + + // DMS CHECK: ValueTypeReturnedAsFields support should be here // remove frame anchor leave(); // If we're returning to interpreted code we will shortly be @@ -725,6 +728,11 @@ // Save (object->mark() | 1) into BasicLock's displaced header str(swap_reg, Address(lock_reg, mark_offset)); + if (EnableValhalla && !UseBiasedLocking) { // DMS CHECK + // For slow path is_always_locked, using biased, which is never natural for !UseBiasLocking + andr(swap_reg, swap_reg, ~markOopDesc::biased_lock_bit_in_place); + } + assert(lock_offset == 0, "displached header must be first word in BasicObjectLock");