stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8260009: InstanceKlass::has_as_permitted_subclass() fails if subclass was redefined

Browse Source 
Reviewed-by: lfoltan, sspitsyn, dholmes
This commit is contained in:
Harold Seigel 2021-01-22 13:52:05 +00:00
parent 7ed8ba1ca0
commit f928265e81
2 changed files with 134 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/hotspot/share/oops/instanceKlass.cpp
View File

@ -250,23 +250,12 @@ bool InstanceKlass::has_as_permitted_subclass(const InstanceKlass* k) const {
return false;
}
// Check for a resolved cp entry, else fall back to a name check.
// We don't want to resolve any class other than the one being checked.
for (int i = 0; i < _permitted_subclasses->length(); i++) {
int cp_index = _permitted_subclasses->at(i);
if (_constants->tag_at(cp_index).is_klass()) {
Klass* k2 = _constants->klass_at(cp_index, THREAD);
assert(!HAS_PENDING_EXCEPTION, "Unexpected exception");
if (k2 == k) {
log_trace(class, sealed)("- class is listed at permitted_subclasses[%d] => cp[%d]", i, cp_index);
return true;
}
} else {
Symbol* name = _constants->klass_name_at(cp_index);
if (name == k->name()) {
log_trace(class, sealed)("- Found it at permitted_subclasses[%d] => cp[%d]", i, cp_index);
return true;
}
Symbol* name = _constants->klass_name_at(cp_index);
if (name == k->name()) {
log_trace(class, sealed)("- Found it at permitted_subclasses[%d] => cp[%d]", i, cp_index);
return true;
}
}
log_trace(class, sealed)("- class is NOT a permitted subclass!");

130
test/hotspot/jtreg/runtime/sealedClasses/RedefinePermittedSubclass.java Normal file
View File

@ -0,0 +1,130 @@
/*
* 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 8260009
* @library /test/lib
* @summary Test that a permitted subclass, that is resolved by its super
class, can be redefined.
* @modules java.base/jdk.internal.misc
* @modules java.instrument
* jdk.jartool/sun.tools.jar
* @requires vm.jvmti
* @compile --enable-preview -source ${jdk.version} RedefinePermittedSubclass.java
* @run main/othervm --enable-preview RedefinePermittedSubclass buildagent
* @run main/othervm/timeout=6000 --enable-preview RedefinePermittedSubclass runtest
*/
import java.io.FileNotFoundException;
import java.io.PrintWriter;
import java.lang.RuntimeException;
import java.lang.instrument.ClassFileTransformer;
import java.lang.instrument.Instrumentation;
import java.security.ProtectionDomain;
import java.lang.instrument.IllegalClassFormatException;
import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.process.OutputAnalyzer;
public class RedefinePermittedSubclass {
non-sealed class A extends Tester {
public void printIt() { System.out.println("In A"); }
}
sealed static class Tester permits A {
// Make sure A is resolved in Tester's constant pool.
public void resolveA(A a) {
a.printIt();
}
}
static class LoggingTransformer implements ClassFileTransformer {
public LoggingTransformer() {}
public byte[] transform(ClassLoader loader, String className,
Class classBeingRedefined, ProtectionDomain protectionDomain,
byte[] classfileBuffer) throws IllegalClassFormatException {
return null;
}
}
public static void premain(String agentArgs, Instrumentation inst) throws Exception {
RedefinePermittedSubclass r = new RedefinePermittedSubclass();
r.play(); // Resolve A before redefining it.
LoggingTransformer t = new LoggingTransformer();
inst.addTransformer(t, true);
{
Class demoClassA = Class.forName("RedefinePermittedSubclass$A");
inst.retransformClasses(demoClassA);
}
}
private static void buildAgent() {
try {
ClassFileInstaller.main("RedefinePermittedSubclass");
} catch (Exception e) {
throw new RuntimeException("Could not write agent classfile", e);
}
try {
PrintWriter pw = new PrintWriter("MANIFEST.MF");
pw.println("Premain-Class: RedefinePermittedSubclass");
pw.println("Agent-Class: RedefinePermittedSubclass");
pw.println("Can-Redefine-Classes: true");
pw.println("Can-Retransform-Classes: true");
pw.close();
} catch (FileNotFoundException e) {
throw new RuntimeException("Could not write manifest file for the agent", e);
}
sun.tools.jar.Main jarTool = new sun.tools.jar.Main(System.out, System.err, "jar");
if (!jarTool.run(new String[] { "-cmf", "MANIFEST.MF", "redefineagent.jar", "RedefinePermittedSubclass.class" })) {
throw new RuntimeException("Could not write the agent jar file");
}
}
public void play () {
A a = new A();
Tester t = new Tester();
t.resolveA(a);
}
public static void main(String argv[]) throws Exception {
RedefinePermittedSubclass r = new RedefinePermittedSubclass();
r.play();
if (argv.length == 1 && argv[0].equals("buildagent")) {
buildAgent();
return;
}
if (argv.length == 1 && argv[0].equals("runtest")) {
String[] javaArgs1 = { "-XX:MetaspaceSize=12m", "-XX:MaxMetaspaceSize=12m",
"-javaagent:redefineagent.jar", "--enable-preview",
"RedefinePermittedSubclass"};
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(javaArgs1);
OutputAnalyzer output = new OutputAnalyzer(pb.start());
output.shouldNotContain("processing of -javaagent failed");
}
}
}