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

     1.1 --- a/src/share/vm/compiler/oopMap.cpp	Fri Jul 11 01:14:44 2008 -0700
     1.2 +++ b/src/share/vm/compiler/oopMap.cpp	Fri Jul 11 12:19:29 2008 -0700
     1.3 @@ -188,10 +188,6 @@
     1.4    }
     1.5  }
     1.6  
     1.7 -void OopMap::set_stack_obj(VMReg reg) {
     1.8 -  set_xxx(reg, OopMapValue::stack_obj, VMRegImpl::Bad());
     1.9 -}
    1.10 -
    1.11  // OopMapSet
    1.12  
    1.13  OopMapSet::OopMapSet() {
    1.14 @@ -399,8 +395,7 @@
    1.15        if ( loc != NULL ) {
    1.16          if ( omv.type() == OopMapValue::oop_value ) {
    1.17  #ifdef ASSERT
    1.18 -          if (COMPILER2_PRESENT(!DoEscapeAnalysis &&)
    1.19 -             (((uintptr_t)loc & (sizeof(*loc)-1)) != 0) ||
    1.20 +          if ((((uintptr_t)loc & (sizeof(*loc)-1)) != 0) ||
    1.21               !Universe::heap()->is_in_or_null(*loc)) {
    1.22              tty->print_cr("# Found non oop pointer.  Dumping state at failure");
    1.23              // try to dump out some helpful debugging information
    1.24 @@ -431,17 +426,6 @@
    1.25        }
    1.26      }
    1.27    }
    1.28 -
    1.29 -#ifdef COMPILER2
    1.30 -  if (DoEscapeAnalysis) {
    1.31 -    for (OopMapStream oms(map, OopMapValue::stack_obj); !oms.is_done(); oms.next()) {
    1.32 -      omv = oms.current();
    1.33 -      assert(omv.is_stack_loc(), "should refer to stack location");
    1.34 -      oop loc = (oop) fr->oopmapreg_to_location(omv.reg(),reg_map);
    1.35 -      oop_fn->do_oop(&loc);
    1.36 -    }
    1.37 -  }
    1.38 -#endif // COMPILER2
    1.39  }
    1.40  
    1.41  
    1.42 @@ -540,9 +524,6 @@
    1.43      st->print("Derived_oop_" );
    1.44      optional->print_on(st);
    1.45      break;
    1.46 -  case OopMapValue::stack_obj:
    1.47 -    st->print("Stack");
    1.48 -    break;
    1.49    default:
    1.50      ShouldNotReachHere();
    1.51    }