Use subclass for denoting a constant field in ABI usage

Sipkab · Sipkab · commit 4faaa00e96de · 2023-08-31T20:16:41.000+02:00
diff --git a/impl/src/main/saker/java/compiler/impl/compile/handler/usage/TopLevelAbiUsage.java b/impl/src/main/saker/java/compiler/impl/compile/handler/usage/TopLevelAbiUsage.java
@@ -135,11 +135,7 @@ public int compareTo(MethodABIInfo o) {
 			if (cmp != 0) {
 				return cmp;
 			}
-			cmp = methodName.compareTo(o.methodName);
-			if (cmp != 0) {
-				return cmp;
-			}
-			return 0;
+			return methodName.compareTo(o.methodName);
 		}
 
 		@Override
@@ -193,28 +189,48 @@ public void readExternal(ObjectInput in) throws IOException, ClassNotFoundExcept
 		}
 	}
 
-	public static final class FieldABIInfo implements Comparable<FieldABIInfo>, Externalizable {
+	public static class FieldABIInfo implements Comparable<FieldABIInfo>, Externalizable {
 		private static final long serialVersionUID = 1L;
 
 		protected String classCanonicalName;
 		protected String fieldName;
-		protected boolean hasConstantValue;
 
 		/**
 		 * For {@link Externalizable}.
 		 */
 		public FieldABIInfo() {
 		}
 
-		private FieldABIInfo(String classCanonicalName, String fieldName, boolean hasConstantValue) {
+		private FieldABIInfo(String classCanonicalName, String fieldName) {
 			this.classCanonicalName = classCanonicalName;
 			this.fieldName = fieldName;
-			this.hasConstantValue = hasConstantValue;
 		}
 
 		public static FieldABIInfo create(ClassSignature enclosingclass, FieldSignature signature) {
-			return new FieldABIInfo(enclosingclass.getCanonicalName(), signature.getSimpleName(),
-					signature.getConstantValue() != null);
+			if (signature.getConstantValue() != null) {
+				return new ConstantFieldABIInfo(enclosingclass.getCanonicalName(), signature.getSimpleName());
+			}
+			return new FieldABIInfo(enclosingclass.getCanonicalName(), signature.getSimpleName());
+		}
+
+		private static class ConstantFieldABIInfo extends FieldABIInfo {
+			private static final long serialVersionUID = 1L;
+
+			/**
+			 * For {@link Externalizable}.
+			 */
+			public ConstantFieldABIInfo() {
+			}
+
+			protected ConstantFieldABIInfo(String classCanonicalName, String fieldName) {
+				super(classCanonicalName, fieldName);
+			}
+
+			@Override
+			public boolean hasConstantValue() {
+				return true;
+			}
+
 		}
 
 		public String getClassCanonicalName() {
@@ -226,7 +242,7 @@ public String getFieldName() {
 		}
 
 		public boolean hasConstantValue() {
-			return hasConstantValue;
+			return false;
 		}
 
 		@Override
@@ -239,11 +255,7 @@ public int compareTo(FieldABIInfo o) {
 			if (cmp != 0) {
 				return cmp;
 			}
-			cmp = Boolean.compare(hasConstantValue, o.hasConstantValue);
-			if (cmp != 0) {
-				return cmp;
-			}
-			return 0;
+			return Boolean.compare(hasConstantValue(), o.hasConstantValue());
 		}
 
 		@Override
@@ -252,7 +264,6 @@ public int hashCode() {
 			int result = 1;
 			result = prime * result + ((classCanonicalName == null) ? 0 : classCanonicalName.hashCode());
 			result = prime * result + ((fieldName == null) ? 0 : fieldName.hashCode());
-			result = prime * result + (hasConstantValue ? 1231 : 1237);
 			return result;
 		}
 
@@ -275,33 +286,27 @@ public boolean equals(Object obj) {
 					return false;
 			} else if (!fieldName.equals(other.fieldName))
 				return false;
-			if (hasConstantValue != other.hasConstantValue)
-				return false;
 			return true;
 		}
 
 		@Override
 		public String toString() {
 			return getClass().getSimpleName() + "["
 					+ (classCanonicalName != null ? "classCanonicalName=" + classCanonicalName + ", " : "")
-					+ (fieldName != null ? "fieldName=" + fieldName + ", " : "") + "hasConstantValue="
-					+ hasConstantValue + "]";
+					+ (fieldName != null ? "fieldName=" + fieldName + ", " : "") + "]";
 		}
 
 		@Override
 		public void writeExternal(ObjectOutput out) throws IOException {
 			out.writeObject(classCanonicalName);
 			out.writeObject(fieldName);
-			out.writeBoolean(hasConstantValue);
 		}
 
 		@Override
 		public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
 			classCanonicalName = (String) in.readObject();
 			fieldName = (String) in.readObject();
-			hasConstantValue = in.readBoolean();
 		}
-
 	}
 
 	public Map<ClassABIInfo, ? extends AbiUsage> getClasses();
