Fix for unique.leaked warning on constructors (Feature request typeto…

…ols#3313) using .astub files, with test cases
aditya3434 · May 28, 2020 · 7794ac9 · 7794ac9
1 parent 60354d3
commit 7794ac9
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 5 deletions.
diff --git a/framework/src/main/java/org/checkerframework/common/aliasing/AliasingVisitor.java b/framework/src/main/java/org/checkerframework/common/aliasing/AliasingVisitor.java
@@ -23,7 +23,6 @@
 import org.checkerframework.framework.type.AnnotatedTypeMirror.AnnotatedDeclaredType;
 import org.checkerframework.framework.type.AnnotatedTypeMirror.AnnotatedExecutableType;
 import org.checkerframework.javacutil.TreeUtils;
-import org.checkerframework.javacutil.TypesUtils;
 
 /**
  * This visitor ensures that every constructor whose result is annotated as {@literal @}Unique does
@@ -71,8 +70,7 @@ public Void visitMethodInvocation(MethodInvocationTree node, Void p) {
                 // Check if a call to super() might create an alias: that
                 // happens when the parent's respective constructor is not @Unique.
                 AnnotatedTypeMirror superResult = atypeFactory.getAnnotatedType(node);
-                if ((!superResult.hasAnnotation(Unique.class))
-                        && (!TypesUtils.isObject(superResult.getUnderlyingType()))) {
+                if (!superResult.hasAnnotation(Unique.class)) {
                     checker.reportError(node, "unique.leaked");
                 }
             } else {
@@ -257,8 +255,7 @@ protected void checkThisOrSuperConstructorCall(
             // Check if a call to super() might create an alias: that
             // happens when the parent's respective constructor is not @Unique.
             AnnotatedTypeMirror superResult = atypeFactory.getAnnotatedType(superCall);
-            if ((!superResult.hasAnnotation(Unique.class))
-                    && (!TypesUtils.isObject(superResult.getUnderlyingType()))) {
+            if (!superResult.hasAnnotation(Unique.class)) {
                 checker.reportError(superCall, "unique.leaked");
             }
         }

diff --git a/framework/src/main/java/org/checkerframework/common/aliasing/jdk.astub b/framework/src/main/java/org/checkerframework/common/aliasing/jdk.astub
@@ -0,0 +1,7 @@
+import org.checkerframework.common.aliasing.qual.*;
+
+package java.lang;
+
+class Object {
+    @Unique Object();
+}
diff --git a/framework/tests/aliasing/UniqueConstructorTest.java b/framework/tests/aliasing/UniqueConstructorTest.java
@@ -0,0 +1,16 @@
+import org.checkerframework.common.aliasing.qual.Unique;
+
+class ParentUniqueClass{
+
+    // No need for @SuppressWarnings()
+    @Unique ParentUniqueClass(){
+        // Doesn't raise unique.leaked error since it's a parent class (top of heirarchy)
+    }
+}
+
+class ChildUniqueClass extends ParentUniqueClass {
+
+    @Unique ChildUniqueClass(){
+        // Doesn't raise unique.leaked error since its parent is @Unique
+    }
+}