Fix crash in Guava (#1622)

The fix for #1587 caused another crash when type-checking Guava. This fixes that crash.
typetools · Nov 1, 2017 · 647526e · 647526e
1 parent 6eed5f0
commit 647526e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/framework/src/org/checkerframework/framework/type/TypeVariableSubstitutor.java b/framework/src/org/checkerframework/framework/type/TypeVariableSubstitutor.java
@@ -42,11 +42,11 @@ public AnnotatedTypeMirror substitute(
      *
      * @param argument the argument to declaration (this will be a value in typeParamToArg)
      * @param use the use that is being replaced
-     * @return a shallow copy of argument with the appropriate annotations applied
+     * @return a deep copy of argument with the appropriate annotations applied
      */
     protected AnnotatedTypeMirror substituteTypeVariable(
             final AnnotatedTypeMirror argument, final AnnotatedTypeVariable use) {
-        final AnnotatedTypeMirror substitute = argument.shallowCopy(false);
+        final AnnotatedTypeMirror substitute = argument.deepCopy(true);
         substitute.addAnnotations(argument.getAnnotationsField());
 
         if (!use.getAnnotationsField().isEmpty()) {

diff --git a/framework/src/org/checkerframework/framework/type/visitor/AnnotatedTypeMerger.java b/framework/src/org/checkerframework/framework/type/visitor/AnnotatedTypeMerger.java
@@ -58,6 +58,7 @@ public AnnotatedTypeMerger(final AnnotationMirror top) {
 
     @Override
     protected Void compare(AnnotatedTypeMirror one, AnnotatedTypeMirror two) {
+        assert one != two;
         if (one != null && two != null) {
             replaceAnnotations(one, two);
         }

diff --git a/framework/tests/all-systems/Issue1587.java b/framework/tests/all-systems/Issue1587.java
@@ -14,4 +14,15 @@ public void method(MyObject one) {
     }
 
     abstract Iterable<MyObject> g(Iterable<MyObject> r);
+
+    interface Class2<C, D extends Class2<C, D>> {}
+
+    static class Class1<A, B extends Class2<A, B>> {
+
+        static void test() {}
+
+        void use() {
+            Class1.test();
+        }
+    }
 }