From a1f4c428ba1b78a4e18afb87c94a5c731a5aa706 Mon Sep 17 00:00:00 2001 From: Christian Hagedorn Date: Thu, 4 Nov 2021 08:53:37 +0000 Subject: [PATCH] 8276227: ciReplay: SIGSEGV if classfile for replay compilation is not present after JDK-8275868 Reviewed-by: kvn, thartmann, dlong --- src/hotspot/share/ci/ciReplay.cpp | 10 ++- .../compiler/ciReplay/TestNoClassFile.java | 73 +++++++++++++++++++ 2 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 test/hotspot/jtreg/compiler/ciReplay/TestNoClassFile.java diff --git a/src/hotspot/share/ci/ciReplay.cpp b/src/hotspot/share/ci/ciReplay.cpp index 903c42ecea7d2..b1f5b82c678ef 100644 --- a/src/hotspot/share/ci/ciReplay.cpp +++ b/src/hotspot/share/ci/ciReplay.cpp @@ -113,6 +113,7 @@ class CompileReplay : public StackObj { FILE* _stream; Thread* _thread; Handle _protection_domain; + bool _protection_domain_initialized; Handle _loader; GrowableArray _ci_method_records; @@ -140,6 +141,7 @@ class CompileReplay : public StackObj { _thread = THREAD; _loader = Handle(_thread, SystemDictionary::java_system_loader()); _protection_domain = Handle(); + _protection_domain_initialized = false; _stream = fopen(filename, "rt"); if (_stream == NULL) { @@ -874,12 +876,18 @@ class CompileReplay : public StackObj { void process_instanceKlass(TRAPS) { // just load the referenced class Klass* k = parse_klass(CHECK); - if (_protection_domain() == NULL) { + if (!_protection_domain_initialized && k != NULL) { + assert(_protection_domain() == NULL, "must be uninitialized"); // The first entry is the holder class of the method for which a replay compilation is requested. // Use the same protection domain to load all subsequent classes in order to resolve all classes // in signatures of inlinees. This ensures that inlining can be done as stated in the replay file. _protection_domain = Handle(_thread, k->protection_domain()); } + + // Only initialize the protection domain handle with the protection domain of the very first entry. + // This also ensures that older replay files work. + _protection_domain_initialized = true; + if (k == NULL) { return; } diff --git a/test/hotspot/jtreg/compiler/ciReplay/TestNoClassFile.java b/test/hotspot/jtreg/compiler/ciReplay/TestNoClassFile.java new file mode 100644 index 0000000000000..be515517e6be0 --- /dev/null +++ b/test/hotspot/jtreg/compiler/ciReplay/TestNoClassFile.java @@ -0,0 +1,73 @@ +/* + * 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. + */ + +/* + * @test + * @bug 8276227 + * @library / /test/lib + * @summary Testing that ciReplay works if we do not find the class files to replay compile. + * @requires vm.flightRecorder != true & vm.compMode != "Xint" & vm.compMode != "Xcomp" & vm.debug == true & vm.compiler2.enabled + * @modules java.base/jdk.internal.misc + * @build sun.hotspot.WhiteBox + * @run driver jdk.test.lib.helpers.ClassFileInstaller sun.hotspot.WhiteBox + * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI + * compiler.ciReplay.TestNoClassFile + */ + +package compiler.ciReplay; + +public class TestNoClassFile extends DumpReplayBase { + + public static void main(String[] args) { + new TestNoClassFile().runTest(TIERED_DISABLED_VM_OPTION); + } + + @Override + public void testAction() { + // Override classpath such that we do not find any class files for replay compilation. Should exit gracefully. + positiveTest("-cp foo", "-XX:+ReplayIgnoreInitErrors"); + } + + @Override + public String getTestClass() { + return NoClassFileMain.class.getName(); + } + +} + +class NoClassFileMain { + public static void main(String[] args) { + for (int i = 0; i < 10000; i++) { + test(); + } + } + public static void test() { + NoClassFileHelper.bar(); + } +} + +class NoClassFileHelper { + public static int bar() { + return 3; + } +}