Skip to content

8364316: JFR: Incorrect validation of mirror fields #26539

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 2 commits into from
Closed

8364316: JFR: Incorrect validation of mirror fields #26539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75be1d4
Initial
Jul 29, 2025
2947c54
Simplify field discovery
Jul 31, 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
4 changes: 2 additions & 2 deletions src/jdk.jfr/share/classes/jdk/jfr/internal/Type.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 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 Down Expand Up @@ -149,7 +149,7 @@ public static Type getKnownType(String typeName) {
return null;
}

static boolean isKnownType(Class<?> type) {
public static boolean isKnownType(Class<?> type) {
if (type.isPrimitive()) {
return true;
}
Expand Down
16 changes: 2 additions & 14 deletions src/jdk.jfr/share/classes/jdk/jfr/internal/TypeLibrary.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ private static void addUserFields(Class<?> clazz, Type type, List<ValueDescripto
dynamicFieldSet.put(dynamicField.getName(), dynamicField);
}
List<Type> newTypes = new ArrayList<>();
for (Field field : Utils.getVisibleEventFields(clazz)) {
for (Field field : Utils.getEventFields(clazz)) {
ValueDescriptor vd = dynamicFieldSet.get(field.getName());
if (vd != null) {
if (!vd.getTypeName().equals(field.getType().getName())) {
Expand All @@ -343,9 +343,7 @@ private static void addUserFields(Class<?> clazz, Type type, List<ValueDescripto
} else {
vd = createField(field);
}
if (vd != null) {
type.add(vd);
}
type.add(vd);
}
addTypes(newTypes);
}
Expand Down Expand Up @@ -384,17 +382,7 @@ private static List<AnnotationElement> createStandardAnnotations(String name, St
}

private static ValueDescriptor createField(Field field) {
int mod = field.getModifiers();
if (Modifier.isTransient(mod)) {
return null;
}
if (Modifier.isStatic(mod)) {
return null;
}
Class<?> fieldType = field.getType();
if (!Type.isKnownType(fieldType)) {
return null;
}
boolean constantPool = Thread.class == fieldType || fieldType == Class.class;
Type type = createType(fieldType);
String fieldName = field.getName();
Expand Down
58 changes: 23 additions & 35 deletions src/jdk.jfr/share/classes/jdk/jfr/internal/util/Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,13 +211,15 @@ public static <T> List<T> sanitizeNullFreeList(List<T> elements, Class<T> clazz)
return sanitized;
}

public static List<Field> getVisibleEventFields(Class<?> clazz) {
public static List<Field> getEventFields(Class<?> clazz) {
List<Field> fields = new ArrayList<>();
for (Class<?> c = clazz; !Utils.isEventBaseClass(c); c = c.getSuperclass()) {
for (Field field : c.getDeclaredFields()) {
// skip private field in base classes
if (c == clazz || !Modifier.isPrivate(field.getModifiers())) {
fields.add(field);
if (isSupportedField(field)) {
// skip private field in base classes
if (c == clazz || !Modifier.isPrivate(field.getModifiers())) {
fields.add(field);
}
}
}
}
Expand Down Expand Up @@ -311,48 +313,34 @@ public static String upgradeLegacyJDKEvent(String eventName) {
}

public static void verifyMirror(Class<? extends MirrorEvent> mirror, Class<?> real) {
Class<?> cMirror = Objects.requireNonNull(mirror);
Class<?> cReal = Objects.requireNonNull(real);

Map<String, Field> mirrorFields = new HashMap<>();
while (cMirror != null) {
for (Field f : cMirror.getDeclaredFields()) {
if (isSupportedType(f.getType())) {
mirrorFields.put(f.getName(), f);
}
for (Field f : mirror.getDeclaredFields()) {
mirrorFields.put(f.getName(), f);
}
for (Field realField : Utils.getEventFields(real)) {
String fieldName = realField.getName();
Field mirrorField = mirrorFields.remove(fieldName);
if (mirrorField == null) {
throw new InternalError("Missing mirror field for " + real.getName() + "#" + fieldName);
}
cMirror = cMirror.getSuperclass();
}
while (cReal != null) {
for (Field realField : cReal.getDeclaredFields()) {
if (isSupportedType(realField.getType()) && !realField.isSynthetic()) {
String fieldName = realField.getName();
Field mirrorField = mirrorFields.get(fieldName);
if (mirrorField == null) {
throw new InternalError("Missing mirror field for " + cReal.getName() + "#" + fieldName);
}
if (realField.getType() != mirrorField.getType()) {
throw new InternalError("Incorrect type for mirror field " + fieldName);
}
if (realField.getModifiers() != mirrorField.getModifiers()) {
throw new InternalError("Incorrect modifier for mirror field " + fieldName);
}
mirrorFields.remove(fieldName);
}
if (realField.getType() != mirrorField.getType()) {
throw new InternalError("Incorrect type for mirror field " + fieldName);
}
if (realField.getModifiers() != mirrorField.getModifiers()) {
throw new InternalError("Incorrect modifier for mirror field " + fieldName);
}
cReal = cReal.getSuperclass();
}

if (!mirrorFields.isEmpty()) {
throw new InternalError("Found additional fields in mirror class " + mirrorFields.keySet());
}
}

private static boolean isSupportedType(Class<?> type) {
if (Modifier.isTransient(type.getModifiers()) || Modifier.isStatic(type.getModifiers())) {
public static boolean isSupportedField(Field field) {
int modifiers = field.getModifiers();
if (Modifier.isTransient(modifiers) || Modifier.isStatic(modifiers)) {
return false;
}
return Type.isValidJavaFieldType(type.getName());
return Type.isKnownType(field.getType());
}

public static void notifyFlush() {
Expand Down