Fix compiler warning

Could not be an NPE previously anyway
apache · Nov 27, 2022 · ce634b1 · ce634b1
1 parent be4aec1
commit ce634b1
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/src/main/java/org/apache/bcel/verifier/structurals/InstConstraintVisitor.java b/src/main/java/org/apache/bcel/verifier/structurals/InstConstraintVisitor.java
@@ -943,19 +943,18 @@ private Field visitFieldInstructionInternals(final FieldInstruction o) throws Cl
             shouldBe = Type.INT;
         }
         if (t instanceof ReferenceType) {
-            ReferenceType rValue = null;
             if (value instanceof ReferenceType) {
-                rValue = (ReferenceType) value;
+                ReferenceType rValue = (ReferenceType) value;
                 referenceTypeIsInitialized(o, rValue);
+                // TODO: This can possibly only be checked using Staerk-et-al's "set-of-object types", not
+                // using "wider cast object types" created during verification.
+                // Comment it out if you encounter problems. See also the analogon at visitPUTFIELD|visitPUTSTATIC.
+                if (!rValue.isAssignmentCompatibleWith(shouldBe)) {
+                    constraintViolated(o, "The stack top type '" + value + "' is not assignment compatible with '" + shouldBe + "'.");
+                }
             } else {
                 constraintViolated(o, "The stack top type '" + value + "' is not of a reference type as expected.");
             }
-            // TODO: This can possibly only be checked using Staerk-et-al's "set-of-object types", not
-            // using "wider cast object types" created during verification.
-            // Comment it out if you encounter problems. See also the analogon at visitPUTFIELD|visitPUTSTATIC.
-            if (!rValue.isAssignmentCompatibleWith(shouldBe)) {
-                constraintViolated(o, "The stack top type '" + value + "' is not assignment compatible with '" + shouldBe + "'.");
-            }
         } else if (shouldBe != value) {
             constraintViolated(o, "The stack top type '" + value + "' is not of type '" + shouldBe + "' as expected.");
         }