src/hotspot/cpu/aarch64/c1_CodeStubs_aarch64.cpp

@@ -165,14 +165,13 @@
   ce->verify_oop_map(_info);
   __ b(_continuation);
 }
 
 // Implementation of SubstitutabilityCheckStub
-SubstitutabilityCheckStub::SubstitutabilityCheckStub(LIR_Opr left, LIR_Opr right, LIR_Opr result, CodeEmitInfo* info) {
+SubstitutabilityCheckStub::SubstitutabilityCheckStub(LIR_Opr left, LIR_Opr right, CodeEmitInfo* info) {
   _left = left;
   _right = right;
-  _result = result;
   _scratch_reg = FrameMap::r0_oop_opr;
   _info = new CodeEmitInfo(info);
 }
 
 void SubstitutabilityCheckStub::emit_code(LIR_Assembler* ce) {

@@ -181,13 +180,10 @@
   ce->store_parameter(_left->as_register(), 1);
   ce->store_parameter(_right->as_register(), 0);
   __ far_call(RuntimeAddress(Runtime1::entry_for(Runtime1::substitutability_check_id)));
   ce->add_call_info_here(_info);
   ce->verify_oop_map(_info);
-  if (_result->as_register() != r0) {
-    __ mov(_result->as_register(), r0);
-  }
   __ b(_continuation);
 }
 
 
 // Implementation of NewInstanceStub