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

     1.1 --- a/src/share/vm/interpreter/oopMapCache.cpp	Fri Aug 31 16:39:35 2012 -0700
     1.2 +++ b/src/share/vm/interpreter/oopMapCache.cpp	Sat Sep 01 13:25:18 2012 -0400
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -194,21 +194,6 @@
    1.11    for (int i = 0; i < N; i++) _bit_mask[i] = 0;
    1.12  }
    1.13  
    1.14 -
    1.15 -void InterpreterOopMap::oop_iterate(OopClosure *blk) {
    1.16 -  if (method() != NULL) {
    1.17 -    blk->do_oop((oop*) &_method);
    1.18 -  }
    1.19 -}
    1.20 -
    1.21 -void InterpreterOopMap::oop_iterate(OopClosure *blk, MemRegion mr) {
    1.22 -  if (method() != NULL && mr.contains(&_method)) {
    1.23 -    blk->do_oop((oop*) &_method);
    1.24 -  }
    1.25 -}
    1.26 -
    1.27 -
    1.28 -
    1.29  void InterpreterOopMap::iterate_oop(OffsetClosure* oop_closure) {
    1.30    int n = number_of_entries();
    1.31    int word_index = 0;
    1.32 @@ -226,13 +211,6 @@
    1.33    }
    1.34  }
    1.35  
    1.36 -void InterpreterOopMap::verify() {
    1.37 -  // If we are doing mark sweep _method may not have a valid header
    1.38 -  // $$$ This used to happen only for m/s collections; we might want to
    1.39 -  // think of an appropriate generalization of this distinction.
    1.40 -  guarantee(Universe::heap()->is_gc_active() || _method->is_oop_or_null(),
    1.41 -            "invalid oop in oopMapCache");
    1.42 -}
    1.43  
    1.44  #ifdef ENABLE_ZAP_DEAD_LOCALS
    1.45  
    1.46 @@ -387,9 +365,6 @@
    1.47      OopMapForCacheEntry gen(method, bci, this);
    1.48      gen.compute_map(CATCH);
    1.49    }
    1.50 -  #ifdef ASSERT
    1.51 -    verify();
    1.52 -  #endif
    1.53  }
    1.54  
    1.55  
    1.56 @@ -464,7 +439,6 @@
    1.57  void InterpreterOopMap::resource_copy(OopMapCacheEntry* from) {
    1.58    assert(_resource_allocate_bit_mask,
    1.59      "Should not resource allocate the _bit_mask");
    1.60 -  assert(from->method()->is_oop(), "MethodOop is bad");
    1.61  
    1.62    set_method(from->method());
    1.63    set_bci(from->bci());
    1.64 @@ -544,18 +518,6 @@
    1.65      }
    1.66  }
    1.67  
    1.68 -void OopMapCache::oop_iterate(OopClosure *blk) {
    1.69 -  for (int i = 0; i < _size; i++) _array[i].oop_iterate(blk);
    1.70 -}
    1.71 -
    1.72 -void OopMapCache::oop_iterate(OopClosure *blk, MemRegion mr) {
    1.73 -    for (int i = 0; i < _size; i++) _array[i].oop_iterate(blk, mr);
    1.74 -}
    1.75 -
    1.76 -void OopMapCache::verify() {
    1.77 -  for (int i = 0; i < _size; i++) _array[i].verify();
    1.78 -}
    1.79 -
    1.80  void OopMapCache::lookup(methodHandle method,
    1.81                           int bci,
    1.82                           InterpreterOopMap* entry_for) {
    1.83 @@ -586,10 +548,10 @@
    1.84    // Compute entry and return it
    1.85  
    1.86    if (method->should_not_be_cached()) {
    1.87 -    // It is either not safe or not a good idea to cache this methodOop
    1.88 +    // It is either not safe or not a good idea to cache this Method*
    1.89      // at this time. We give the caller of lookup() a copy of the
    1.90      // interesting info via parameter entry_for, but we don't add it to
    1.91 -    // the cache. See the gory details in methodOop.cpp.
    1.92 +    // the cache. See the gory details in Method*.cpp.
    1.93      compute_one_oop_map(method, bci, entry_for);
    1.94      return;
    1.95    }