Skip to content

8366908: Use a different class for testing JDK-8351654 #27116

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
wants to merge 3 commits into from
Closed

8366908: Use a different class for testing JDK-8351654 #27116

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b348035
8366908: Use a different class for testing JDK-8351654
coleenp Sep 4, 2025
0616cf6
remove unreachable line.
coleenp Sep 5, 2025
e95eff7
Update test/hotspot/jtreg/runtime/verifier/CFLH/TestVerify.java
coleenp Sep 8, 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
8 changes: 4 additions & 4 deletions test/hotspot/jtreg/runtime/verifier/CFLH/TestVerify.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
*/

import java.lang.invoke.MethodHandles;
import java.time.Duration;
import java.lang.classfile.ClassFile;
import java.lang.classfile.ClassTransform;
import java.lang.classfile.MethodTransform;
Expand All @@ -61,7 +60,7 @@

public class TestVerify {

private static final String CLASS_TO_BREAK = "java.time.Duration";
private static final String CLASS_TO_BREAK = "java.util.Date";
private static final String INTERNAL_CLASS_TO_BREAK = CLASS_TO_BREAK.replace('.', '/');
private static final boolean DEBUG = false;

Expand Down Expand Up @@ -91,7 +90,7 @@ public byte[] transform(Module module, ClassLoader loader, String className, Cla
}
builder.with(element);
});
var classTransform = ClassTransform.transformingMethods(mm -> mm.methodName().stringValue().equals("getSeconds"), methodTransform);
var classTransform = ClassTransform.transformingMethods(mm -> mm.methodName().stringValue().equals("parse"), methodTransform);

byte[] bytes;
try {
Expand Down Expand Up @@ -164,7 +163,8 @@ public static void main(String argv[]) throws Exception {
} else {
// Load the class instrumented with CFLH for the VerifyError.
inst.addTransformer(new BadTransformer());
System.out.println("1 hour is " + Duration.ofHours(1).getSeconds() + " seconds");
Class<?> cls = Class.forName(CLASS_TO_BREAK);
System.out.println("class loaded" + cls);
Copy link
Member

@liach liach Sep 5, 2025

Choose a reason for hiding this comment

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

Isn't this println redundant, because the VerifyError is supposed to be thrown before? I think the old code uses Durations.ofHours to trigger verification and initialization of Duration.

Copy link
Contributor Author

@coleenp coleenp Sep 5, 2025

Choose a reason for hiding this comment

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

It is not reached since we throw the VerifyError at line 166.

}
throw new RuntimeException("Failed: Did not throw VerifyError");
} catch (VerifyError e) {
Expand Down