< prev index next >

src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp

Print this page
@@ -21,10 +21,11 @@
   * questions.
   *
   */
  
  #include "precompiled.hpp"
+ #include "c1/c1_IR.hpp"
  #include "c1/c1_MacroAssembler.hpp"
  #include "c1/c1_Runtime1.hpp"
  #include "gc/shared/barrierSet.hpp"
  #include "gc/shared/barrierSetAssembler.hpp"
  #include "gc/shared/collectedHeap.hpp"

@@ -93,10 +94,11 @@
    movptr(Address(disp_hdr, 0), hdr);
    // otherwise we don't care about the result and handle locking via runtime call
    jcc(Assembler::notZero, slow_case);
    // done
    bind(done);
+   
    return null_check_offset;
  }
  
  
  void C1_MacroAssembler::unlock_object(Register hdr, Register obj, Register disp_hdr, Label& slow_case) {

@@ -355,10 +357,14 @@
    //     + 4: ...
  
    movptr(reg, Address(rbp, (offset_in_words + 2) * BytesPerWord));
  }
  
+ void C1_MacroAssembler::oopmap_metadata(CodeEmitInfo* info) {
+   MacroAssembler::oopmap_metadata(info != NULL ? info->oop_map()->index() : -1);
+ }
+ 
  #ifndef PRODUCT
  
  void C1_MacroAssembler::verify_stack_oop(int stack_offset) {
    if (!VerifyOops) return;
    verify_oop_addr(Address(rsp, stack_offset));
< prev index next >