Skip to content

8346985: Convert test/jdk/com/sun/jdi/ClassUnloadEventTest.java to Class-File API #22915

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
asotona wants to merge 2 commits into from
Closed

8346985: Convert test/jdk/com/sun/jdi/ClassUnloadEventTest.java to Class-File API #22915

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc0b9df
8346985: Convert test/jdk/com/sun/jdi/ClassUnloadEventTest.java to Cl…
asotona Jan 3, 2025
9e8471d
updated copyright year
asotona Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 11 additions & 18 deletions test/jdk/com/sun/jdi/ClassUnloadEventTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2022, 2025, 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
Expand All @@ -24,18 +24,13 @@
/*
* @test
* @bug 8256811
* @modules java.base/jdk.internal.org.objectweb.asm
* java.base/jdk.internal.misc
* @modules java.base/jdk.internal.misc
* @library /test/lib
* @build jdk.test.whitebox.WhiteBox
* @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
* @run main/othervm/native ClassUnloadEventTest run
*/

import jdk.internal.org.objectweb.asm.ClassWriter;
import jdk.internal.org.objectweb.asm.Label;
import jdk.internal.org.objectweb.asm.MethodVisitor;
import jdk.internal.org.objectweb.asm.Opcodes;
import jdk.test.lib.classloader.ClassUnloadCommon;

import com.sun.jdi.*;
Expand All @@ -45,6 +40,9 @@

import java.util.*;
import java.io.*;
import java.lang.classfile.ClassFile;
import java.lang.constant.ClassDesc;
import java.lang.constant.ConstantDescs;

public class ClassUnloadEventTest {
static final String CLASS_NAME_PREFIX = "SampleClass__";
Expand All @@ -65,18 +63,13 @@ public static void main(String[] args) throws Exception {
}
}

private static class TestClassLoader extends ClassLoader implements Opcodes {
private static class TestClassLoader extends ClassLoader {
private static byte[] generateSampleClass(String name) {
ClassWriter cw = new ClassWriter(0);

cw.visit(52, ACC_SUPER | ACC_PUBLIC, name, null, "java/lang/Object", null);
Copy link
Member

@liach liach Jan 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This anticipates an internal name but gets a binary name passed. This works in the old code accidentally because its classes were in the unnamed package. The port fixes this bug.

MethodVisitor mv = cw.visitMethod(ACC_PUBLIC | ACC_STATIC, "m", "()V", null, null);
mv.visitCode();
mv.visitInsn(RETURN);
mv.visitMaxs(0, 0);
mv.visitEnd();
cw.visitEnd();
return cw.toByteArray();
return ClassFile.of().build(ClassDesc.of(name), clb ->
clb.withVersion(52, 0)
.withFlags(ClassFile.ACC_SUPER | ClassFile.ACC_PUBLIC)
.withMethodBody("m", ConstantDescs.MTD_void, ClassFile.ACC_PUBLIC | ClassFile.ACC_STATIC, cob ->
cob.return_()));
}

@Override
Expand Down