archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-15 08:34:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8261585: Restore HandleArea used in Deoptimization::uncommon_trap

Browse source 
Reviewed-by: coleenp, jiefu
This commit is contained in:
Hui Shi 2021-02-13 02:47:33 +00:00 • committed by Jie Fu
parent 849390a11e
commit 95d73129ce
2 changed files with 64 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/hotspot/share/runtime/deoptimization.cpp
View file

@ -2465,6 +2465,7 @@ Deoptimization::UnrollBlock* Deoptimization::uncommon_trap(JavaThread* thread, j
// This enters VM and may safepoint
uncommon_trap_inner(thread, trap_request);
}
HandleMark hm(thread);
return fetch_unroll_info_helper(thread, exec_mode);
}

63
test/hotspot/jtreg/compiler/uncommontrap/UncommonTrapLeak.java Normal file
View file

@ -0,0 +1,63 @@
/*
* Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
import java.lang.ref.WeakReference;
/*
* @test
* @bug 8260473
* @summary Handle leak might cause object not collected as expected
*
* @run main/othervm -XX:-Inline -XX:-TieredCompilation -XX:CompileCommand=compileonly,UncommonTrapLeak.foo
* -XX:CompileThreshold=100 -XX:-BackgroundCompilation UncommonTrapLeak
*
* @author Hui Shi
*/
public class UncommonTrapLeak {
static WeakReference<Object> ref = null;
static int val = 0;
public static void main(String args[]) {
for (int i = 0; i < 300; i++) {
val++;
foo(i);
System.gc();
if (ref.get() != null) {
throw new RuntimeException("Failed: referent not collected after trap " + ref.get());
}
if (i % 100 == 0) {
System.out.println(i);
}
}
}
static void foo(int i) {
Object o = new Object();
ref = new WeakReference<Object>(o);
if (val == 200) {
// trigger Deoptimization::uncommon_trap
if (o instanceof UncommonTrapLeak) {
}
}
}
}