comparison src/share/vm/runtime/virtualspace.cpp @ 4934:7df3125953cb

7146354: Re-enable Compressed OOPs after 7118647 is resolved Summary: Relax the assertion to simply check for COOP mode rather than an exact address. Reviewed-by: coleenp, kvn, phh, dcubed Contributed-by: james.melvin@oracle.com
author coleenp
date Thu, 16 Feb 2012 15:52:01 -0500
parents f08d439fab8c
children d2a62e0f25eb
comparison
equal deleted inserted replaced
4932:f1cb6f9cfe21 4934:7df3125953cb
1 /* 1 /*
2 * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
453 } 453 }
454 } 454 }
455 455
456 void ReservedSpace::protect_noaccess_prefix(const size_t size) { 456 void ReservedSpace::protect_noaccess_prefix(const size_t size) {
457 assert( (_noaccess_prefix != 0) == (UseCompressedOops && _base != NULL && 457 assert( (_noaccess_prefix != 0) == (UseCompressedOops && _base != NULL &&
458 (size_t(_base + _size) > OopEncodingHeapMax) && 458 (Universe::narrow_oop_base() != NULL) &&
459 Universe::narrow_oop_use_implicit_null_checks()), 459 Universe::narrow_oop_use_implicit_null_checks()),
460 "noaccess_prefix should be used only with non zero based compressed oops"); 460 "noaccess_prefix should be used only with non zero based compressed oops");
461 461
462 // If there is no noaccess prefix, return. 462 // If there is no noaccess prefix, return.
463 if (_noaccess_prefix == 0) return; 463 if (_noaccess_prefix == 0) return;