comparison src/share/vm/oops/arrayKlass.cpp @ 6152:958bb4b7be49

Merge
author asaha
date Tue, 10 Apr 2012 10:42:34 -0700
parents a735aec54ea4
children da91efe96a93
comparison
equal deleted inserted replaced
6151:e778c29768e6 6152:958bb4b7be49
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.
151 if (length < 0) { 151 if (length < 0) {
152 THROW_0(vmSymbols::java_lang_NegativeArraySizeException()); 152 THROW_0(vmSymbols::java_lang_NegativeArraySizeException());
153 } 153 }
154 if (length > arrayOopDesc::max_array_length(T_ARRAY)) { 154 if (length > arrayOopDesc::max_array_length(T_ARRAY)) {
155 report_java_out_of_memory("Requested array size exceeds VM limit"); 155 report_java_out_of_memory("Requested array size exceeds VM limit");
156 JvmtiExport::post_array_size_exhausted();
156 THROW_OOP_0(Universe::out_of_memory_error_array_size()); 157 THROW_OOP_0(Universe::out_of_memory_error_array_size());
157 } 158 }
158 int size = objArrayOopDesc::object_size(length); 159 int size = objArrayOopDesc::object_size(length);
159 klassOop k = array_klass(n+dimension(), CHECK_0); 160 klassOop k = array_klass(n+dimension(), CHECK_0);
160 arrayKlassHandle ak (THREAD, k); 161 arrayKlassHandle ak (THREAD, k);