src/hotspot/cpu/x86/macroAssembler_x86.hpp

@@ -313,10 +313,12 @@
   void testbool(Register dst);
 
   void resolve_oop_handle(Register result, Register tmp = rscratch2);
   void load_mirror(Register mirror, Register method, Register tmp = rscratch2);
 
+  void load_method_holder(Register holder, Register method);
+
   // oop manipulations
   void load_klass(Register dst, Register src);
   void store_klass(Register dst, Register src);
 
   void access_load_at(BasicType type, DecoratorSet decorators, Register dst, Address src,

@@ -577,10 +579,15 @@
   void check_klass_subtype(Register sub_klass,
                            Register super_klass,
                            Register temp_reg,
                            Label& L_success);
 
+  void clinit_barrier(Register klass,
+                      Register thread,
+                      Label* L_fast_path = NULL,
+                      Label* L_slow_path = NULL);
+
   // method handles (JSR 292)
   Address argument_address(RegisterOrConstant arg_slot, int extra_slot_offset = 0);
 
   //----
   void set_word_if_not_zero(Register reg); // sets reg to 1 if not zero, otherwise 0