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

     1.1 --- a/src/share/vm/c1/c1_LinearScan.cpp	Fri May 23 14:46:59 2014 -0700
     1.2 +++ b/src/share/vm/c1/c1_LinearScan.cpp	Wed May 21 11:25:25 2014 +0200
     1.3 @@ -2382,16 +2382,6 @@
     1.4    int arg_count = frame_map()->oop_map_arg_count();
     1.5    OopMap* map = new OopMap(frame_size, arg_count);
     1.6  
     1.7 -  // Check if this is a patch site.
     1.8 -  bool is_patch_info = false;
     1.9 -  if (op->code() == lir_move) {
    1.10 -    assert(!is_call_site, "move must not be a call site");
    1.11 -    assert(op->as_Op1() != NULL, "move must be LIR_Op1");
    1.12 -    LIR_Op1* move = (LIR_Op1*)op;
    1.13 -
    1.14 -    is_patch_info = move->patch_code() != lir_patch_none;
    1.15 -  }
    1.16 -
    1.17    // Iterate through active intervals
    1.18    for (Interval* interval = iw->active_first(fixedKind); interval != Interval::end(); interval = interval->next()) {
    1.19      int assigned_reg = interval->assigned_reg();
    1.20 @@ -2406,7 +2396,7 @@
    1.21      // moves, any intervals which end at this instruction are included
    1.22      // in the oop map since we may safepoint while doing the patch
    1.23      // before we've consumed the inputs.
    1.24 -    if (is_patch_info || op->id() < interval->current_to()) {
    1.25 +    if (op->is_patching() || op->id() < interval->current_to()) {
    1.26  
    1.27        // caller-save registers must not be included into oop-maps at calls
    1.28        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");