Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/share/vm/runtime/reflection.cpp	Fri May 31 13:02:24 2013 +0200
     1.2 +++ b/src/share/vm/runtime/reflection.cpp	Fri May 31 20:24:58 2013 +0200
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -375,7 +375,7 @@
    1.11      }
    1.12    }
    1.13    klass = klass->array_klass(dim, CHECK_NULL);
    1.14 -  oop obj = ArrayKlass::cast(klass)->multi_allocate(len, dimensions, THREAD);
    1.15 +  oop obj = ArrayKlass::cast(klass)->multi_allocate(len, dimensions, CHECK_NULL);
    1.16    assert(obj->is_array(), "just checking");
    1.17    return arrayOop(obj);
    1.18  }

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/runtime/memory/MultiAllocateNullCheck.java	Fri May 31 20:24:58 2013 +0200
     2.3 @@ -0,0 +1,45 @@
     2.4 +/*
     2.5 + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
     2.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.7 + *
     2.8 + * This code is free software; you can redistribute it and/or modify it
     2.9 + * under the terms of the GNU General Public License version 2 only, as
    2.10 + * published by the Free Software Foundation.
    2.11 + *
    2.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
    2.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    2.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    2.15 + * version 2 for more details (a copy is included in the LICENSE file that
    2.16 + * accompanied this code).
    2.17 + *
    2.18 + * You should have received a copy of the GNU General Public License version
    2.19 + * 2 along with this work; if not, write to the Free Software Foundation,
    2.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2.21 + *
    2.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    2.23 + * or visit www.oracle.com if you need additional information or have any
    2.24 + * questions.
    2.25 + */
    2.26 +
    2.27 +/*
    2.28 + * @test MultiAllocateNullCheck
    2.29 + * @bug 6726963
    2.30 + * @summary multi_allocate() call does not CHECK_NULL and causes crash in fastdebug bits
    2.31 + * @run main/othervm -Xmx32m MultiAllocateNullCheck
    2.32 + */
    2.33 +
    2.34 +import java.lang.reflect.Array;
    2.35 +
    2.36 +public class MultiAllocateNullCheck {
    2.37 +      public static void main(String[] args) throws Exception {
    2.38 +        Object x = null;
    2.39 +        try
    2.40 +        {
    2.41 +            x = Array.newInstance(String.class, new int[]
    2.42 +                {Integer.MAX_VALUE, Integer.MAX_VALUE});
    2.43 +            System.out.println("Array was created");
    2.44 +        } catch (OutOfMemoryError e) {
    2.45 +            System.out.println("Out of memory occured, which is OK in this case");
    2.46 +        }
    2.47 +    }
    2.48 +}