archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

7146354: Re-enable Compressed OOPs after 7118647 is resolved

Browse source 
Relax the assertion to simply check for COOP mode rather than an exact address.

Reviewed-by: coleenp, kvn, phh, dcubed
This commit is contained in:
James Melvin 2012-02-16 15:52:01 -05:00 • committed by Coleen Phillimore
parent 510522ff57
commit ac2ed39761
2 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
hotspot/src/share/vm/runtime/arguments.cpp
View file

@ -1370,12 +1370,9 @@ void Arguments::set_ergonomics_flags() {
// by ergonomics. // by ergonomics.
if (MaxHeapSize <= max_heap_for_compressed_oops()) { if (MaxHeapSize <= max_heap_for_compressed_oops()) {
#if !defined(COMPILER1) || defined(TIERED) #if !defined(COMPILER1) || defined(TIERED)
// disable UseCompressedOops by default on MacOS X until 7118647 is fixed
#ifndef __APPLE__
if (FLAG_IS_DEFAULT(UseCompressedOops)) { if (FLAG_IS_DEFAULT(UseCompressedOops)) {
FLAG_SET_ERGO(bool, UseCompressedOops, true); FLAG_SET_ERGO(bool, UseCompressedOops, true);
} }
#endif // !__APPLE__
#endif #endif
#ifdef _WIN64 #ifdef _WIN64
if (UseLargePages && UseCompressedOops) { if (UseLargePages && UseCompressedOops) {

4
hotspot/src/share/vm/runtime/virtualspace.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -455,7 +455,7 @@ void ReservedSpace::release() {
void ReservedSpace::protect_noaccess_prefix(const size_t size) { void ReservedSpace::protect_noaccess_prefix(const size_t size) {
assert( (_noaccess_prefix != 0) == (UseCompressedOops && _base != NULL && assert( (_noaccess_prefix != 0) == (UseCompressedOops && _base != NULL &&
(size_t(_base + _size) > OopEncodingHeapMax) && (Universe::narrow_oop_base() != NULL) &&
Universe::narrow_oop_use_implicit_null_checks()), Universe::narrow_oop_use_implicit_null_checks()),
"noaccess_prefix should be used only with non zero based compressed oops"); "noaccess_prefix should be used only with non zero based compressed oops");