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

Merge
author asaha
date Tue, 10 Apr 2012 10:42:34 -0700
parents a735aec54ea4
children b632e80fc9dc
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.
66 objArrayOop a = (objArrayOop)CollectedHeap::array_allocate(h_k, size, length, CHECK_NULL); 66 objArrayOop a = (objArrayOop)CollectedHeap::array_allocate(h_k, size, length, CHECK_NULL);
67 assert(a->is_parsable(), "Can't publish unless parsable"); 67 assert(a->is_parsable(), "Can't publish unless parsable");
68 return a; 68 return a;
69 } else { 69 } else {
70 report_java_out_of_memory("Requested array size exceeds VM limit"); 70 report_java_out_of_memory("Requested array size exceeds VM limit");
71 JvmtiExport::post_array_size_exhausted();
71 THROW_OOP_0(Universe::out_of_memory_error_array_size()); 72 THROW_OOP_0(Universe::out_of_memory_error_array_size());
72 } 73 }
73 } else { 74 } else {
74 THROW_0(vmSymbols::java_lang_NegativeArraySizeException()); 75 THROW_0(vmSymbols::java_lang_NegativeArraySizeException());
75 } 76 }