Mercurial > hg > truffle
annotate src/share/vm/utilities/growableArray.cpp @ 1721:413ad0331a0c
6977924: Changes for 6975078 produce build error with certain gcc versions
Summary: The changes introduced for 6975078 assign badHeapOopVal to the _allocation field in the ResourceObj class. In 32 bit linux builds with certain versions of gcc this assignment will be flagged as an error while compiling allocation.cpp. In 32 bit builds the constant value badHeapOopVal (which is cast to an intptr_t) is negative. The _allocation field is typed as an unsigned intptr_t and gcc catches this as an error.
Reviewed-by: jcoomes, ysr, phh
| author | johnc |
|---|---|
| date | Wed, 18 Aug 2010 10:59:06 -0700 |
| parents | c18cbe5936b8 |
| children | f95d63e2154a |
| rev | line source |
|---|---|
| 0 | 1 /* |
|
1552
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
596
diff
changeset
|
2 * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved. |
| 0 | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
| 4 * | |
| 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 | |
| 7 * published by the Free Software Foundation. | |
| 8 * | |
| 9 * This code is distributed in the hope that it will be useful, but WITHOUT | |
| 10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 12 * version 2 for more details (a copy is included in the LICENSE file that | |
| 13 * accompanied this code). | |
| 14 * | |
| 15 * You should have received a copy of the GNU General Public License version | |
| 16 * 2 along with this work; if not, write to the Free Software Foundation, | |
| 17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | |
| 18 * | |
|
1552
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
596
diff
changeset
|
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
596
diff
changeset
|
20 * or visit www.oracle.com if you need additional information or have any |
|
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
596
diff
changeset
|
21 * questions. |
| 0 | 22 * |
| 23 */ | |
| 24 # include "incls/_precompiled.incl" | |
| 25 # include "incls/_growableArray.cpp.incl" | |
| 26 | |
| 27 #ifdef ASSERT | |
| 28 void GenericGrowableArray::set_nesting() { | |
| 29 if (on_stack()) { | |
| 30 _nesting = Thread::current()->resource_area()->nesting(); | |
| 31 } | |
| 32 } | |
| 33 | |
| 34 void GenericGrowableArray::check_nesting() { | |
| 35 // Check for insidious allocation bug: if a GrowableArray overflows, the | |
| 36 // grown array must be allocated under the same ResourceMark as the original. | |
| 37 // Otherwise, the _data array will be deallocated too early. | |
| 38 if (on_stack() && | |
| 39 _nesting != Thread::current()->resource_area()->nesting()) { | |
| 40 fatal("allocation bug: GrowableArray could grow within nested ResourceMark"); | |
| 41 } | |
| 42 } | |
| 43 #endif | |
| 44 | |
| 45 void* GenericGrowableArray::raw_allocate(int elementSize) { | |
|
596
83ef1482304c
6806226: Signed integer overflow in growable array code causes JVM crash
jmasa
parents:
0
diff
changeset
|
46 assert(_max >= 0, "integer overflow"); |
|
83ef1482304c
6806226: Signed integer overflow in growable array code causes JVM crash
jmasa
parents:
0
diff
changeset
|
47 size_t byte_size = elementSize * (size_t) _max; |
| 0 | 48 if (on_stack()) { |
|
596
83ef1482304c
6806226: Signed integer overflow in growable array code causes JVM crash
jmasa
parents:
0
diff
changeset
|
49 return (void*)resource_allocate_bytes(byte_size); |
| 0 | 50 } else if (on_C_heap()) { |
|
596
83ef1482304c
6806226: Signed integer overflow in growable array code causes JVM crash
jmasa
parents:
0
diff
changeset
|
51 return (void*)AllocateHeap(byte_size, "GrET in " __FILE__); |
| 0 | 52 } else { |
|
596
83ef1482304c
6806226: Signed integer overflow in growable array code causes JVM crash
jmasa
parents:
0
diff
changeset
|
53 return _arena->Amalloc(byte_size); |
| 0 | 54 } |
| 55 } |