# HG changeset patch # User rkennke # Date 1538078647 -7200 # Thu Sep 27 22:04:07 2018 +0200 # Node ID 48b941fd8a6709f51c23b4e0827d527e70058475 # Parent dade6dd87bb4f79d57d8f5e9ff549e5934a2f9c1 8211241: Missing obj equals in TemplateTable::fast_aldc diff --git a/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp b/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp --- a/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp +++ b/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp @@ -412,7 +412,7 @@ // Stash null_sentinel address to get its value later __ movptr(rarg, (uintptr_t)Universe::the_null_sentinel_addr()); __ ldr(tmp, Address(rarg)); - __ cmp(result, tmp); + __ cmpoop(result, tmp); __ br(Assembler::NE, notNull); __ mov(result, 0); // NULL object reference __ bind(notNull); diff --git a/src/hotspot/cpu/x86/templateTable_x86.cpp b/src/hotspot/cpu/x86/templateTable_x86.cpp --- a/src/hotspot/cpu/x86/templateTable_x86.cpp +++ b/src/hotspot/cpu/x86/templateTable_x86.cpp @@ -448,7 +448,7 @@ Label notNull; ExternalAddress null_sentinel((address)Universe::the_null_sentinel_addr()); __ movptr(tmp, null_sentinel); - __ cmpptr(tmp, result); + __ cmpoop(tmp, result); __ jccb(Assembler::notEqual, notNull); __ xorptr(result, result); // NULL object reference __ bind(notNull);