Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/share/vm/gc_implementation/g1/g1CodeCacheRemSet.cpp	Mon Jul 07 10:12:40 2014 +0200
     1.2 +++ b/src/share/vm/gc_implementation/g1/g1CodeCacheRemSet.cpp	Wed Jul 09 16:44:30 2014 +0200
     1.3 @@ -169,7 +169,7 @@
     1.4  
     1.5  void G1CodeRootSet::add(nmethod* method) {
     1.6    if (!contains(method)) {
     1.7 -    // Find the first chunk thatisn't full.
     1.8 +    // Find the first chunk that isn't full.
     1.9      G1CodeRootChunk* cur = _list.head();
    1.10      while (cur != NULL) {
    1.11        if (!cur->is_full()) {

     2.1 --- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	Mon Jul 07 10:12:40 2014 +0200
     2.2 +++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	Wed Jul 09 16:44:30 2014 +0200
     2.3 @@ -5330,7 +5330,7 @@
     2.4      // Do first pass of code cache cleaning.
     2.5      _code_cache_task.work_first_pass(worker_id);
     2.6  
     2.7 -    // Let the threads, mark that the first pass is done.
     2.8 +    // Let the threads mark that the first pass is done.
     2.9      _code_cache_task.barrier_mark(worker_id);
    2.10  
    2.11      // Clean the Strings and Symbols.

     3.1 --- a/src/share/vm/oops/instanceKlass.cpp	Mon Jul 07 10:12:40 2014 +0200
     3.2 +++ b/src/share/vm/oops/instanceKlass.cpp	Wed Jul 09 16:44:30 2014 +0200
     3.3 @@ -1969,8 +1969,7 @@
     3.4      if (nm == b->get_nmethod()) {
     3.5  #ifdef ASSERT
     3.6        int count = b->count();
     3.7 -      assert(count >= 0, "Just check if we ever get here 1");
     3.8 -      assert(count > 0,  "Just check if we ever get here 2");
     3.9 +      assert(count >= 0, err_msg("count shouldn't be negative: %d", count));
    3.10  #endif
    3.11        return true;
    3.12      }

     4.1 --- a/src/share/vm/utilities/array.hpp	Mon Jul 07 10:12:40 2014 +0200
     4.2 +++ b/src/share/vm/utilities/array.hpp	Wed Jul 09 16:44:30 2014 +0200
     4.3 @@ -328,6 +328,8 @@
     4.4    static size_t byte_sizeof(int length) { return sizeof(Array<T>) + MAX2(length - 1, 0) * sizeof(T); }
     4.5  
     4.6    // WhiteBox API helper.
     4.7 +  // Can't distinguish between array of length 0 and length 1,
     4.8 +  // will always return 0 in those cases.
     4.9    static int bytes_to_length(size_t bytes)       {
    4.10      assert(is_size_aligned(bytes, BytesPerWord), "Must be, for now");
    4.11