Skip to content

Commit d2675cb

Browse files
committed
Use equals instead of == for descriptor comparison
1 parent 4849e0d commit d2675cb

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

src/main/java/io/github/dmlloyd/classfile/CodeBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@ default CodeBuilder conversion(TypeKind fromType, TypeKind toType) {
554554
*/
555555
default CodeBuilder loadConstant(ConstantDesc value) {
556556
//avoid switch expressions here
557-
if (value == null || value == ConstantDescs.NULL)
557+
if (value == null || value.equals(ConstantDescs.NULL))
558558
return aconst_null();
559559
if (value instanceof Number) {
560560
if (value instanceof Integer) return loadConstant((int) value);

src/main/java/io/github/dmlloyd/classfile/impl/StackMapGenerator.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -975,12 +975,12 @@ public String toString() {
975975
}
976976

977977
Frame pushStack(ClassDesc desc) {
978-
if (desc == CD_long) return pushStack(Type.LONG_TYPE, Type.LONG2_TYPE);
979-
if (desc == CD_double) return pushStack(Type.DOUBLE_TYPE, Type.DOUBLE2_TYPE);
980-
return desc == CD_void ? this
978+
if (desc.equals(CD_long)) return pushStack(Type.LONG_TYPE, Type.LONG2_TYPE);
979+
if (desc.equals(CD_double)) return pushStack(Type.DOUBLE_TYPE, Type.DOUBLE2_TYPE);
980+
return desc.equals(CD_void) ? this
981981
: pushStack(
982982
desc.isPrimitive()
983-
? (desc == CD_float ? Type.FLOAT_TYPE : Type.INTEGER_TYPE)
983+
? (desc.equals(CD_float) ? Type.FLOAT_TYPE : Type.INTEGER_TYPE)
984984
: Type.referenceType(desc));
985985
}
986986

@@ -1078,18 +1078,18 @@ void setLocalsFromArg(String name, MethodTypeDesc methodDesc, boolean isStatic,
10781078
}
10791079
for (int i = 0; i < methodDesc.parameterCount(); i++) {
10801080
var desc = methodDesc.parameterType(i);
1081-
if (desc == CD_long) {
1081+
if (desc.equals(CD_long)) {
10821082
locals[localsSize ] = Type.LONG_TYPE;
10831083
locals[localsSize + 1] = Type.LONG2_TYPE;
10841084
localsSize += 2;
1085-
} else if (desc == CD_double) {
1085+
} else if (desc.equals(CD_double)) {
10861086
locals[localsSize ] = Type.DOUBLE_TYPE;
10871087
locals[localsSize + 1] = Type.DOUBLE2_TYPE;
10881088
localsSize += 2;
10891089
} else {
10901090
if (!desc.isPrimitive()) {
10911091
type = Type.referenceType(desc);
1092-
} else if (desc == CD_float) {
1092+
} else if (desc.equals(CD_float)) {
10931093
type = Type.FLOAT_TYPE;
10941094
} else {
10951095
type = Type.INTEGER_TYPE;

src/main/java/io/github/dmlloyd/classfile/impl/Util.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,15 +243,15 @@ static void writeList(BufWriterImpl buf, Writable[] array, int size) {
243243
}
244244

245245
public static int slotSize(ClassDesc desc) {
246-
return desc == CD_void ? 0 : isDoubleSlot(desc) ? 2 : 1;
246+
return desc.equals(CD_void) ? 0 : isDoubleSlot(desc) ? 2 : 1;
247247
}
248248

249249
public static int paramSlotSize(ClassDesc desc) {
250250
return isDoubleSlot(desc) ? 2 : 1;
251251
}
252252

253253
public static boolean isDoubleSlot(ClassDesc desc) {
254-
return desc == CD_double || desc == CD_long;
254+
return desc.equals(CD_double) || desc.equals(CD_long);
255255
}
256256

257257
public static void dumpMethod(SplitConstantPool cp,

0 commit comments

Comments
 (0)