src/cpu/x86/vm/macroAssembler_x86.cpp

rev 7209 : [mq]: inccms

*** 2962,2972 ****
                                     int con_size_in_bytes,
                                     Register t1,
                                     Label& slow_case) {
    assert(obj == rax, "obj must be in rax, for cmpxchg");
    assert_different_registers(obj, var_size_in_bytes, t1);
!   if (CMSIncrementalMode || !Universe::heap()->supports_inline_contig_alloc()) {
      jmp(slow_case);
    } else {
      Register end = t1;
      Label retry;
      bind(retry);
--- 2962,2972 ----
                                     int con_size_in_bytes,
                                     Register t1,
                                     Label& slow_case) {
    assert(obj == rax, "obj must be in rax, for cmpxchg");
    assert_different_registers(obj, var_size_in_bytes, t1);
!   if (!Universe::heap()->supports_inline_contig_alloc()) {
      jmp(slow_case);
    } else {
      Register end = t1;
      Label retry;
      bind(retry);
*** 4435,4445 ****
    Register t2  = rsi;
    Register thread_reg = NOT_LP64(rdi) LP64_ONLY(r15_thread);
    assert_different_registers(top, thread_reg, t1, t2, /* preserve: */ rbx, rdx);
    Label do_refill, discard_tlab;
  
!   if (CMSIncrementalMode || !Universe::heap()->supports_inline_contig_alloc()) {
      // No allocation in the shared eden.
      jmp(slow_case);
    }
  
    NOT_LP64(get_thread(thread_reg));
--- 4435,4445 ----
    Register t2  = rsi;
    Register thread_reg = NOT_LP64(rdi) LP64_ONLY(r15_thread);
    assert_different_registers(top, thread_reg, t1, t2, /* preserve: */ rbx, rdx);
    Label do_refill, discard_tlab;
  
!   if (!Universe::heap()->supports_inline_contig_alloc()) {
      // No allocation in the shared eden.
      jmp(slow_case);
    }
  
    NOT_LP64(get_thread(thread_reg));