From 8f094d32b2a0f0fdb99ff72eed6f7125e0c5768e Mon Sep 17 00:00:00 2001 From: Jie Fu Date: Fri, 13 May 2022 10:41:16 +0800 Subject: [PATCH 1/2] ShenandoahControlThread::request_gc misses the case of GCCause::_codecache_GC_threshold --- .../gc/shenandoah/shenandoahControlThread.cpp | 2 ++ test/jdk/java/foreign/TestIntrinsics.java | 15 +++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp b/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp index 9f5273a975074..366f6c3480a52 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2013, 2021, Red Hat, Inc. All rights reserved. + * Copyright (C) 2022 THL A29 Limited, a Tencent company. 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 @@ -478,6 +479,7 @@ void ShenandoahControlThread::request_gc(GCCause::Cause cause) { assert(GCCause::is_user_requested_gc(cause) || GCCause::is_serviceability_requested_gc(cause) || cause == GCCause::_metadata_GC_clear_soft_refs || + cause == GCCause::_codecache_GC_threshold || cause == GCCause::_full_gc_alot || cause == GCCause::_wb_full_gc || cause == GCCause::_wb_breakpoint || diff --git a/test/jdk/java/foreign/TestIntrinsics.java b/test/jdk/java/foreign/TestIntrinsics.java index 60ed3faf757e6..0d0d35aff1a61 100644 --- a/test/jdk/java/foreign/TestIntrinsics.java +++ b/test/jdk/java/foreign/TestIntrinsics.java @@ -32,6 +32,21 @@ * TestIntrinsics */ +/* + * @test + * @bug 8286681 + * @summary ShenandoahControlThread::request_gc misses the case of GCCause::_codecache_GC_threshold + * @enablePreview + * @requires os.arch=="amd64" | os.arch=="x86_64" | os.arch=="aarch64" + * @requires vm.gc.Shenandoah + * @run testng/othervm + * -Djdk.internal.foreign.ProgrammableInvoker.USE_SPEC=true + * --enable-native-access=ALL-UNNAMED + * -Xbatch + * -XX:+UseShenandoahGC + * TestIntrinsics + */ + import java.lang.foreign.Addressable; import java.lang.foreign.Linker; import java.lang.foreign.FunctionDescriptor; From dc96246c2c92a0b4d4df5172a195b428ff8a43c7 Mon Sep 17 00:00:00 2001 From: Jie Fu Date: Fri, 13 May 2022 21:40:22 +0800 Subject: [PATCH 2/2] Revert the test change --- test/jdk/java/foreign/TestIntrinsics.java | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/test/jdk/java/foreign/TestIntrinsics.java b/test/jdk/java/foreign/TestIntrinsics.java index 0d0d35aff1a61..60ed3faf757e6 100644 --- a/test/jdk/java/foreign/TestIntrinsics.java +++ b/test/jdk/java/foreign/TestIntrinsics.java @@ -32,21 +32,6 @@ * TestIntrinsics */ -/* - * @test - * @bug 8286681 - * @summary ShenandoahControlThread::request_gc misses the case of GCCause::_codecache_GC_threshold - * @enablePreview - * @requires os.arch=="amd64" | os.arch=="x86_64" | os.arch=="aarch64" - * @requires vm.gc.Shenandoah - * @run testng/othervm - * -Djdk.internal.foreign.ProgrammableInvoker.USE_SPEC=true - * --enable-native-access=ALL-UNNAMED - * -Xbatch - * -XX:+UseShenandoahGC - * TestIntrinsics - */ - import java.lang.foreign.Addressable; import java.lang.foreign.Linker; import java.lang.foreign.FunctionDescriptor;