From 1cc6e70ad56f706e6da0e406500f218c5332c40e Mon Sep 17 00:00:00 2001
From: Neethu Prasad <neethp@amazon.com>
Date: Thu, 13 Jun 2024 21:06:27 +0000
Subject: [PATCH] Backport d5f59cf0a8efe8d0f2d8ab1a5bd68fa9fe15fb1a

---
 .../recorder/checkpoint/types/jfrTypeSet.cpp  |   2 +-
 .../jfr/api/consumer/TestRecordedClass.java   | 115 ++++++++++++++++++
 2 files changed, 116 insertions(+), 1 deletion(-)
 create mode 100644 test/jdk/jdk/jfr/api/consumer/TestRecordedClass.java

diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp
index 2c0f74d13ed..762e4d441e9 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp
@@ -219,7 +219,7 @@ static int write_klass(JfrCheckpointWriter* writer, KlassPtr klass, bool leakp)
   writer->write(cld != nullptr ? cld_id(cld, leakp) : 0);
   writer->write(mark_symbol(klass, leakp));
   writer->write(package_id(klass, leakp));
-  writer->write(get_flags(klass));
+  writer->write(klass->modifier_flags());
   writer->write<bool>(klass->is_hidden());
   return 1;
 }
diff --git a/test/jdk/jdk/jfr/api/consumer/TestRecordedClass.java b/test/jdk/jdk/jfr/api/consumer/TestRecordedClass.java
new file mode 100644
index 00000000000..19c63704919
--- /dev/null
+++ b/test/jdk/jdk/jfr/api/consumer/TestRecordedClass.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2023, 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.
+ */
+
+package jdk.jfr.api.consumer;
+
+import java.lang.reflect.Modifier;
+import java.util.List;
+
+import jdk.jfr.Event;
+import jdk.jfr.Recording;
+import jdk.jfr.consumer.RecordedClass;
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.test.lib.jfr.Events;
+
+/**
+ * @test
+ * @summary Verifies methods of RecordedClass
+ * @key jfr
+ * @requires vm.hasJFR
+ * @library /test/lib
+ * @run main/othervm jdk.jfr.api.consumer.TestRecordedClass
+ */
+public class TestRecordedClass {
+
+    static class TestEvent extends Event {
+        Class<?> typeA;
+        Class<?> typeB;
+    }
+
+    private static class TypeA {
+    }
+
+    public final static class TypeB {
+    }
+
+    public static void main(String[] args) throws Exception {
+        try (Recording recording = new Recording()) {
+            recording.start();
+            TestEvent event = new TestEvent();
+            event.typeA = TypeA.class;
+            event.typeB = TypeB.class;
+            event.commit();
+            recording.stop();
+
+            List<RecordedEvent> events = Events.fromRecording(recording);
+            Events.hasEvents(events);
+            for (RecordedEvent recordedEvent : events) {
+                RecordedClass typeA = recordedEvent.getClass("typeA");
+                RecordedClass typeB = recordedEvent.getClass("typeB");
+                assertModifiers(typeA, TypeA.class);
+                assertModifiers(typeB, TypeB.class);
+                assertName(typeA, TypeA.class);
+                assertName(typeB, TypeB.class);
+                assertClassLoader(typeA, TypeA.class.getClassLoader());
+                assertClassLoader(typeB, TypeB.class.getClassLoader());
+                assertId(typeA);
+                assertId(typeB);
+                if (typeA.getId() == typeB.getId()) {
+                    throw new Exception("Same ID for different classes");
+                }
+            }
+        }
+    }
+
+    private static void assertId(RecordedClass recordedClass) throws Exception {
+        long id = recordedClass.getId();
+        if (id < 1 || id >= 1024 * 1024) {
+            throw new Exception("Expected class ID to be above 1 and below 1 M");
+        }
+    }
+
+    private static void assertClassLoader(RecordedClass recordedClass, ClassLoader classLoader) throws Exception {
+        String expected = classLoader.getClass().getName();
+        String actual = recordedClass.getClassLoader().getType().getName();
+        if (!expected.equals(actual)) {
+            throw new Exception("Expected class loader to be " + expected + ", was " + actual);
+        }
+    }
+
+    private static void assertName(RecordedClass recordedClass, Class<?> clazz) throws Exception {
+        String className = clazz.getClass().getName();
+        if (className.equals(recordedClass.getName())) {
+            throw new Exception("Expected class to be named " + className);
+        }
+    }
+
+    private static void assertModifiers(RecordedClass recordedClass, Class<?> clazz) throws Exception {
+        int modifiers = clazz.getModifiers();
+        if (modifiers != recordedClass.getModifiers()) {
+            String expected = Modifier.toString(modifiers);
+            String actual = Modifier.toString(recordedClass.getModifiers());
+            throw new Exception("Expected modifier to be '" + expected + "', was '" + actual + "'");
+        }
+    }
+}