Modify the implementation of isUnnamedClass()

Change the order of the checks to do modifier check first Closes eclipse-openj9#17725 Signed-off-by: Hang Shao <hangshao@ca.ibm.com>
hangshao0 · Jul 11, 2023 · 0e3e1bc · 0e3e1bc
1 parent a499fcf
commit 0e3e1bc
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/jcl/src/java.base/share/classes/java/lang/Class.java b/jcl/src/java.base/share/classes/java/lang/Class.java
@@ -5782,12 +5782,13 @@ public Set<AccessFlag> accessFlags() {
 	 */
 	public boolean isUnnamedClass() {
 		boolean rc = false;
-		if ((null == getEnclosingObjectClass())
-			&& (null == getDeclaringClass())
-			&& isSynthetic()
-			&& (Modifier.FINAL == (getModifiers() & Modifier.FINAL))
-		) {
-			rc = true;
+		if (!isArray()) {
+			int rawModifiers = getModifiersImpl();
+			if ((Modifier.FINAL | SYNTHETIC) == (rawModifiers & (Modifier.FINAL | SYNTHETIC))) {
+				if ((null == getEnclosingObjectClass()) && (null == getDeclaringClass())) {
+					rc = true;
+				}
+			}
 		}
 		return rc;
 	}