Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/c1/c1_LinearScan.cpp	Sat Sep 03 14:03:54 2011 -0700
     1.2 +++ b/src/share/vm/c1/c1_LinearScan.cpp	Mon Sep 05 17:09:05 2011 -0700
     1.3 @@ -2404,7 +2404,7 @@
     1.4        assert(!is_call_site || assigned_reg >= nof_regs || !is_caller_save(assigned_reg), "interval is in a caller-save register at a call -> register will be overwritten");
     1.5  
     1.6        VMReg name = vm_reg_for_interval(interval);
     1.7 -      map->set_oop(name);
     1.8 +      set_oop(map, name);
     1.9  
    1.10        // Spill optimization: when the stack value is guaranteed to be always correct,
    1.11        // then it must be added to the oop map even if the interval is currently in a register
    1.12 @@ -2415,7 +2415,7 @@
    1.13          assert(interval->canonical_spill_slot() >= LinearScan::nof_regs, "no spill slot assigned");
    1.14          assert(interval->assigned_reg() < LinearScan::nof_regs, "interval is on stack, so stack slot is registered twice");
    1.15  
    1.16 -        map->set_oop(frame_map()->slot_regname(interval->canonical_spill_slot() - LinearScan::nof_regs));
    1.17 +        set_oop(map, frame_map()->slot_regname(interval->canonical_spill_slot() - LinearScan::nof_regs));
    1.18        }
    1.19      }
    1.20    }
    1.21 @@ -2424,7 +2424,7 @@
    1.22    assert(info->stack() != NULL, "CodeEmitInfo must always have a stack");
    1.23    int locks_count = info->stack()->total_locks_size();
    1.24    for (int i = 0; i < locks_count; i++) {
    1.25 -    map->set_oop(frame_map()->monitor_object_regname(i));
    1.26 +    set_oop(map, frame_map()->monitor_object_regname(i));
    1.27    }
    1.28  
    1.29    return map;