Correct code and refine example

eisop · Jan 8, 2025 · 5cc6842 · 5cc6842
1 parent b0ed675
commit 5cc6842
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/checker/src/main/java/org/checkerframework/checker/pico/PICONoInitAnnotatedTypeFactory.java b/checker/src/main/java/org/checkerframework/checker/pico/PICONoInitAnnotatedTypeFactory.java
@@ -156,11 +156,12 @@ public QualifierHierarchy createQualifierHierarchy() {
 
     @Override
     public ParameterizedExecutableType constructorFromUse(NewClassTree tree) {
-        boolean hasExplicitAnnos = getExplicitNewClassAnnos(tree).isEmpty();
+        boolean noExplicitAnnotations = getExplicitNewClassAnnos(tree).isEmpty();
         ParameterizedExecutableType mType = super.constructorFromUse(tree);
         AnnotatedExecutableType method = mType.executableType;
-        if (hasExplicitAnnos && method.getReturnType().hasAnnotation(RECEIVER_DEPENDENT_MUTABLE)) {
-            method.getReturnType().replaceAnnotation(MUTABLE);
+        if (noExplicitAnnotations
+                && method.getReturnType().hasAnnotation(RECEIVER_DEPENDENT_MUTABLE)) {
+            method.getReturnType().replaceAnnotation(IMMUTABLE);
         }
         return mType;
     }

diff --git a/checker/tests/pico-immutability/HashCodeSafetyExample.java b/checker/tests/pico-immutability/HashCodeSafetyExample.java
@@ -7,7 +7,7 @@
 public class HashCodeSafetyExample {
     public static void main(String[] args) {
         A a = new A();
-        HashMap<A, String> m = new @Mutable HashMap<>();
+        Map<A, String> m = new @Mutable HashMap<>();
         m.put(a, "hello");
         System.out.println("HashCode before: " + a.hashCode());
         // :: error: (illegal.field.write)