Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/share/vm/runtime/perfMemory.cpp	Thu Jan 16 17:27:33 2014 -0800
     1.2 +++ b/src/share/vm/runtime/perfMemory.cpp	Tue Jan 21 08:58:31 2014 -0500
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 2001, 2014, 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 @@ -155,7 +155,7 @@
    1.11  
    1.12  void PerfMemory::destroy() {
    1.13  
    1.14 -  assert(_prologue != NULL, "prologue pointer must be initialized");
    1.15 +  if (_prologue == NULL) return;
    1.16  
    1.17    if (_start != NULL && _prologue->overflow != 0) {
    1.18  

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/runtime/PerfMemDestroy/PerfMemDestroy.java	Tue Jan 21 08:58:31 2014 -0500
     2.3 @@ -0,0 +1,40 @@
     2.4 +/*
     2.5 + * Copyright (c) 2014, 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
    2.29 + * @bug 8030955
    2.30 + * @summary Allow multiple calls to PerfMemory::destroy() without asserting.
    2.31 + * @library /testlibrary
    2.32 + * @run main PerfMemDestroy
    2.33 + */
    2.34 +
    2.35 +import com.oracle.java.testlibrary.*;
    2.36 +
    2.37 +public class PerfMemDestroy {
    2.38 +    public static void main(String args[]) throws Throwable {
    2.39 +        ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+PerfAllowAtExitRegistration", "-version");
    2.40 +        OutputAnalyzer output = new OutputAnalyzer(pb.start());
    2.41 +        output.shouldHaveExitValue(0);
    2.42 +    }
    2.43 +}