# HG changeset patch # User bobv # Date 1496414144 14400 # Node ID e41531cfe73e774cf63665bb512225710563ef36 # Parent c454d65f0370b7b9b5c7be889f3158668ad78cac 8181093: assert(si->is_ldr_literal()) failed on arm64 test nsk/jdi/.../returnValue004 Reviewed-by: kvn, dlong diff -r c454d65f0370 -r e41531cfe73e hotspot/src/cpu/arm/vm/relocInfo_arm.cpp --- a/hotspot/src/cpu/arm/vm/relocInfo_arm.cpp Tue May 30 21:35:21 2017 +0300 +++ b/hotspot/src/cpu/arm/vm/relocInfo_arm.cpp Fri Jun 02 10:35:44 2017 -0400 @@ -139,7 +139,7 @@ #ifdef AARCH64 #ifdef COMPILER2 NativeMovConstReg* ni = nativeMovConstReg_at(addr()); - if (ni->is_movz()) { + if (ni->is_mov_slow()) { return; } #endif