IDEA-93295 Make: removing reference to supertype from subtype does not make client code re-compiled

java/java-tests/testData/compileServer/incremental/classProperties/removeExtendsAffectsFieldAccess.log

@@ -0,0 +1,14 @@
+Cleaning output files:
+out/production/RemoveExtendsAffectsFieldAccess/GoalSwitch.class
+End of files
+Compiling files:
+src/GoalSwitch.java
+End of files
+Cleaning output files:
+out/production/RemoveExtendsAffectsFieldAccess/FarClient.class
+out/production/RemoveExtendsAffectsFieldAccess/SwitchProvider.class
+End of files
+Compiling files:
+src/FarClient.java
+src/SwitchProvider.java
+End of files

java/java-tests/testData/compileServer/incremental/classProperties/removeExtendsAffectsFieldAccess/GoalSwitch.java.new

@@ -0,0 +1,2 @@
+public class GoalSwitch {
+}

java/java-tests/testData/compileServer/incremental/classProperties/removeExtendsAffectsFieldAccess/src/FarClient.java

@@ -0,0 +1,5 @@
+public class FarClient {
+    public void context() {
+        FarGoal goal1 = new SwitchProvider().field;
+    }
+}

java/java-tests/testData/compileServer/incremental/classProperties/removeExtendsAffectsFieldAccess/src/FarGoal.java

@@ -0,0 +1,2 @@
+public class FarGoal {
+}

java/java-tests/testData/compileServer/incremental/classProperties/removeExtendsAffectsFieldAccess/src/GoalSwitch.java

@@ -0,0 +1,2 @@
+public class GoalSwitch extends FarGoal{
+}

java/java-tests/testData/compileServer/incremental/classProperties/removeExtendsAffectsFieldAccess/src/SwitchProvider.java

@@ -0,0 +1,3 @@
+public class SwitchProvider {
+    public GoalSwitch field;
+}

java/java-tests/testData/compileServer/incremental/classProperties/removeExtendsAffectsMethodAccess.log

@@ -0,0 +1,14 @@
+Cleaning output files:
+out/production/RemoveExtendsAffectsMethodAccess/GoalSwitch.class
+End of files
+Compiling files:
+src/GoalSwitch.java
+End of files
+Cleaning output files:
+out/production/RemoveExtendsAffectsMethodAccess/FarClient.class
+out/production/RemoveExtendsAffectsMethodAccess/SwitchProvider.class
+End of files
+Compiling files:
+src/FarClient.java
+src/SwitchProvider.java
+End of files

java/java-tests/testData/compileServer/incremental/classProperties/removeExtendsAffectsMethodAccess/GoalSwitch.java.new

@@ -0,0 +1,2 @@
+public class GoalSwitch {
+}

java/java-tests/testData/compileServer/incremental/classProperties/removeExtendsAffectsMethodAccess/src/FarClient.java

@@ -0,0 +1,5 @@
+public class FarClient {
+    public void context() {
+        FarGoal goal2 = new SwitchProvider().method();
+    }
+}

java/java-tests/testData/compileServer/incremental/classProperties/removeExtendsAffectsMethodAccess/src/FarGoal.java

@@ -0,0 +1,2 @@
+public class FarGoal {
+}

java/java-tests/testData/compileServer/incremental/classProperties/removeExtendsAffectsMethodAccess/src/GoalSwitch.java

@@ -0,0 +1,2 @@
+public class GoalSwitch extends FarGoal{
+}

java/java-tests/testData/compileServer/incremental/classProperties/removeExtendsAffectsMethodAccess/src/SwitchProvider.java

@@ -0,0 +1,5 @@
+public class SwitchProvider {
+    public GoalSwitch method() {
+        return new GoalSwitch();
+    }
+}

java/java-tests/testData/compileServer/incremental/common/class2Interface1.log

@@ -7,9 +7,11 @@ End of files
 Cleaning output files:
 out/production/Class2Interface1/Client$1.class
 out/production/Class2Interface1/Client.class
+out/production/Class2Interface1/Main.class
 out/production/Class2Interface1/SubClient.class
 End of files
 Compiling files:
 src/Client.java
+src/Main.java
 src/SubClient.java
 End of files

jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/ClassfileAnalyzer.java

@@ -500,6 +500,11 @@ class ClassfileAnalyzer {
           if (opcode == Opcodes.PUTFIELD || opcode == Opcodes.PUTSTATIC) {
             myUsages.add(UsageRepr.createFieldAssignUsage(myContext, fieldName, fieldOwner, descr));
           }
+
+          if (opcode == Opcodes.GETFIELD || opcode == Opcodes.GETSTATIC) {
+            addClassUsage(TypeRepr.getType(myContext, descr));
+          }
+
           myUsages.add(UsageRepr.createFieldUsage(myContext, fieldName, fieldOwner, descr));
           super.visitFieldInsn(opcode, owner, name, desc);
         }
@@ -511,9 +516,27 @@ class ClassfileAnalyzer {
 
           myUsages.add(UsageRepr.createMethodUsage(myContext, methodName, methodOwner, desc));
           myUsages.add(UsageRepr.createMetaMethodUsage(myContext, methodName, methodOwner, desc));
+          addClassUsage(TypeRepr.getType(myContext, Type.getReturnType(desc)));
 
           super.visitMethodInsn(opcode, owner, name, desc);
         }
+
+        private void addClassUsage(final TypeRepr.AbstractType type) {
+          TypeRepr.ClassType classType = null;
+          if (type instanceof TypeRepr.ClassType) {
+            classType = (TypeRepr.ClassType)type;
+          }
+          else if (type instanceof TypeRepr.ArrayType) {
+            final TypeRepr.AbstractType elemType = ((TypeRepr.ArrayType)type).getDeepElementType();
+            if (elemType instanceof TypeRepr.ClassType) {
+              classType = (TypeRepr.ClassType)elemType;
+            }
+          }
+          if (classType != null) {
+            myUsages.add(UsageRepr.createClassUsage(myContext, classType.myClassName));
+          }
+        }
+
       };
     }
 

jps/jps-builders/testSrc/org/jetbrains/ether/ClassPropertyTest.java

@@ -28,6 +28,14 @@ public class ClassPropertyTest extends IncrementalTestCase {
     doTest();
   }
 
+  public void testRemoveExtendsAffectsFieldAccess() throws Exception {
+    doTest();
+  }
+
+  public void testRemoveExtendsAffectsMethodAccess() throws Exception {
+    doTest();
+  }
+
   public void testRemoveImplements() throws Exception {
     doTest();
   }