author | stefank |
Tue, 05 Apr 2016 10:35:39 +0200 | |
changeset 37254 | 8631304f255c |
parent 14583 | d70ee55535f4 |
permissions | -rw-r--r-- |
1 | 1 |
/* |
13963
e5b53c306fb5
7197424: update copyright year to match last edit in jdk8 hotspot repository
mikael
parents:
13195
diff
changeset
|
2 |
* Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. |
1 | 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 |
* |
|
5547
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
2122
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
2122
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
2122
diff
changeset
|
21 |
* questions. |
1 | 22 |
* |
23 |
*/ |
|
24 |
||
7397 | 25 |
#include "precompiled.hpp" |
26 |
#include "memory/resourceArea.hpp" |
|
14583
d70ee55535f4
8003935: Simplify the needed includes for using Thread::current()
stefank
parents:
13963
diff
changeset
|
27 |
#include "runtime/thread.inline.hpp" |
7397 | 28 |
#include "utilities/growableArray.hpp" |
14583
d70ee55535f4
8003935: Simplify the needed includes for using Thread::current()
stefank
parents:
13963
diff
changeset
|
29 |
|
1 | 30 |
#ifdef ASSERT |
31 |
void GenericGrowableArray::set_nesting() { |
|
32 |
if (on_stack()) { |
|
33 |
_nesting = Thread::current()->resource_area()->nesting(); |
|
34 |
} |
|
35 |
} |
|
36 |
||
37 |
void GenericGrowableArray::check_nesting() { |
|
38 |
// Check for insidious allocation bug: if a GrowableArray overflows, the |
|
39 |
// grown array must be allocated under the same ResourceMark as the original. |
|
40 |
// Otherwise, the _data array will be deallocated too early. |
|
41 |
if (on_stack() && |
|
42 |
_nesting != Thread::current()->resource_area()->nesting()) { |
|
43 |
fatal("allocation bug: GrowableArray could grow within nested ResourceMark"); |
|
44 |
} |
|
45 |
} |
|
46 |
#endif |
|
47 |
||
48 |
void* GenericGrowableArray::raw_allocate(int elementSize) { |
|
2122
6e2cad7ee1f5
6806226: Signed integer overflow in growable array code causes JVM crash
jmasa
parents:
1
diff
changeset
|
49 |
assert(_max >= 0, "integer overflow"); |
6e2cad7ee1f5
6806226: Signed integer overflow in growable array code causes JVM crash
jmasa
parents:
1
diff
changeset
|
50 |
size_t byte_size = elementSize * (size_t) _max; |
1 | 51 |
if (on_stack()) { |
2122
6e2cad7ee1f5
6806226: Signed integer overflow in growable array code causes JVM crash
jmasa
parents:
1
diff
changeset
|
52 |
return (void*)resource_allocate_bytes(byte_size); |
1 | 53 |
} else if (on_C_heap()) { |
13195 | 54 |
return (void*)AllocateHeap(byte_size, _memflags); |
1 | 55 |
} else { |
2122
6e2cad7ee1f5
6806226: Signed integer overflow in growable array code causes JVM crash
jmasa
parents:
1
diff
changeset
|
56 |
return _arena->Amalloc(byte_size); |
1 | 57 |
} |
58 |
} |