src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp

@@ -3691,11 +3691,11 @@
   ldr(holder, Address(method, Method::const_offset()));                      // ConstMethod*
   ldr(holder, Address(holder, ConstMethod::constants_offset()));             // ConstantPool*
   ldr(holder, Address(holder, ConstantPool::pool_holder_offset_in_bytes())); // InstanceKlass*
 }
 
-void MacroAssembler::load_klass(Register dst, Register src) {
+void MacroAssembler::load_metadata(Register dst, Register src) {
   if (UseCompressedClassPointers) {
     ldrw(dst, Address(src, oopDesc::klass_offset_in_bytes()));
   } else {
     ldr(dst, Address(src, oopDesc::klass_offset_in_bytes()));
   }

@@ -5910,14 +5910,10 @@
   if (C->need_stack_bang(bangsize) && UseStackBanging)
      generate_stack_overflow_check(bangsize);
 
   build_frame(framesize);
 
-  if (NotifySimulator) {
-    notify(Assembler::method_entry);
-  }
-
   if (VerifyStackAtCalls) {
     Unimplemented();
   }
 }