Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/share/vm/runtime/arguments.cpp	Thu Feb 16 13:50:54 2012 -0500
     1.2 +++ b/src/share/vm/runtime/arguments.cpp	Thu Feb 16 17:19:40 2012 -0500
     1.3 @@ -1370,12 +1370,9 @@
     1.4    // by ergonomics.
     1.5    if (MaxHeapSize <= max_heap_for_compressed_oops()) {
     1.6  #if !defined(COMPILER1) || defined(TIERED)
     1.7 -// disable UseCompressedOops by default on MacOS X until 7118647 is fixed
     1.8 -#ifndef __APPLE__
     1.9      if (FLAG_IS_DEFAULT(UseCompressedOops)) {
    1.10        FLAG_SET_ERGO(bool, UseCompressedOops, true);
    1.11      }
    1.12 -#endif // !__APPLE__
    1.13  #endif
    1.14  #ifdef _WIN64
    1.15      if (UseLargePages && UseCompressedOops) {

     2.1 --- a/src/share/vm/runtime/virtualspace.cpp	Thu Feb 16 13:50:54 2012 -0500
     2.2 +++ b/src/share/vm/runtime/virtualspace.cpp	Thu Feb 16 17:19:40 2012 -0500
     2.3 @@ -1,5 +1,5 @@
     2.4  /*
     2.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
     2.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
     2.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.8   *
     2.9   * This code is free software; you can redistribute it and/or modify it
    2.10 @@ -455,7 +455,7 @@
    2.11  
    2.12  void ReservedSpace::protect_noaccess_prefix(const size_t size) {
    2.13    assert( (_noaccess_prefix != 0) == (UseCompressedOops && _base != NULL &&
    2.14 -                                      (size_t(_base + _size) > OopEncodingHeapMax) &&
    2.15 +                                      (Universe::narrow_oop_base() != NULL) &&
    2.16                                        Universe::narrow_oop_use_implicit_null_checks()),
    2.17           "noaccess_prefix should be used only with non zero based compressed oops");
    2.18