MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 14:23:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

JPS mappings for incremental compilation refactoring: for overridden method analysis, search for non-abstract methods using exact match (with return type), like it is in bytecode

Browse Source 
GitOrigin-RevId: f77752af33fab766b2863c408ea0cfdea96a21b5
This commit is contained in:
Eugene Zhuravlev
2023-10-19 20:27:15 +02:00
committed by intellij-monorepo-bot
parent be7be5f683
commit 2c149d06ef
18 changed files with 97 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3.log Normal file
View File

@@ -0,0 +1,14 @@
Cleaning output files:
out/production/ChangeToCovariantMethodInBase3/maketest/BaseImplementation.class
End of files
Compiling files:
src/maketest/BaseImplementation.java
End of files
Cleaning output files:
out/production/ChangeToCovariantMethodInBase3/maketest/IImpl.class
out/production/ChangeToCovariantMethodInBase3/maketest/Mediator.class
End of files
Compiling files:
src/maketest/IImpl.java
src/maketest/Mediator.java
End of files

10
java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/data.xml
View File

@@ -1,10 +0,0 @@
<testData>
<deleted_by_make>
<file path="classes/maketest/BaseImplementation.class" />
<file path="classes/maketest/Mediator.class" />
</deleted_by_make>
<recompile>
<file path="source/maketest/Mediator.java" />
</recompile>
</testData>

16
java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase4.log Normal file
View File

@@ -0,0 +1,16 @@
Cleaning output files:
out/production/ChangeToCovariantMethodInBase4/maketest/BaseBaseImpl.class
out/production/ChangeToCovariantMethodInBase4/maketest/BaseImplementation.class
End of files
Compiling files:
src/maketest/BaseBaseImpl.java
src/maketest/BaseImplementation.java
End of files
Cleaning output files:
out/production/ChangeToCovariantMethodInBase4/maketest/IImpl.class
out/production/ChangeToCovariantMethodInBase4/maketest/Mediator.class
End of files
Compiling files:
src/maketest/IImpl.java
src/maketest/Mediator.java
End of files

7
java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase4/src/maketest/BaseBaseImpl.java Normal file
View File

@@ -0,0 +1,7 @@
package maketest;
public class BaseBaseImpl {
public Data getData() {
return new DataEx();
}
}

7
java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase4/src/maketest/BaseBaseImpl.java.new Normal file
View File

@@ -0,0 +1,7 @@
package maketest;
public class BaseBaseImpl {
public DataEx getData() {
return new DataEx();
}
}

7
java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase4/src/maketest/BaseImplementation.java Normal file
View File

@@ -0,0 +1,7 @@
package maketest;
public class BaseImplementation extends BaseBaseImpl {
public Data getData() {
return new DataEx();
}
}

7
java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase4/src/maketest/BaseImplementation.java.new Normal file
View File

@@ -0,0 +1,7 @@
package maketest;
public class BaseImplementation extends BaseBaseImpl {
public DataEx getData() {
return new DataEx();
}
}

4
java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase4/src/maketest/Data.java Normal file
View File

@@ -0,0 +1,4 @@
package maketest;
public class Data {
}

4
java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase4/src/maketest/DataEx.java Normal file
View File

@@ -0,0 +1,4 @@
package maketest;
public class DataEx extends Data {
}

5
java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase4/src/maketest/I.java Normal file
View File

@@ -0,0 +1,5 @@
package maketest;
public interface I {
Data getData();
}

4
java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase4/src/maketest/IImpl.java Normal file
View File

@@ -0,0 +1,4 @@
package maketest;
public class IImpl extends Mediator {
}

4
java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase4/src/maketest/J.java Normal file
View File

@@ -0,0 +1,4 @@
package maketest;
public interface J extends I {
}

4
java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase4/src/maketest/Mediator.java Normal file
View File

@@ -0,0 +1,4 @@
package maketest;
public class Mediator extends BaseImplementation implements J {
}

2
java/java-tests/testData/compileServer/incremental/membersChange/addOverridingMethodAndChangeReturnType.log
View File

@@ -7,10 +7,8 @@ src/ppp/BaseA.java
src/ppp/BaseB.java
End of files
Cleaning output files:
out/production/AddOverridingMethodAndChangeReturnType/ppp/BaseB.class
out/production/AddOverridingMethodAndChangeReturnType/ppp/Client.class
End of files
Compiling files:
src/ppp/BaseB.java
src/ppp/Client.java
End of files

2
java/java-tests/testData/compileServer/incremental/membersChange/pushFieldDown.log
View File

@@ -8,9 +8,7 @@ src/ppp/Super.java
End of files
Cleaning output files:
out/production/PushFieldDown/ppp/Main.class
out/production/PushFieldDown/ppp/Sub.class
End of files
Compiling files:
src/ppp/Main.java
src/ppp/Sub.java
End of files

6
jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/Mappings.java
View File

@@ -1266,7 +1266,7 @@ public final class Mappings {
debug("Current method overrides the added method");
final Iterable<File> files = classToSourceFileGet(methodClass.name);
if (files != null) {
if (files != null && !containsAll(myCompiledFiles, files)) {
ContainerUtil.addAll(myAffectedFiles, files);
if (myDebugS.isDebugEnabled()) {
for (File file : files) {
@@ -1351,7 +1351,7 @@ public final class Mappings {
for (final Pair<MethodRepr, ClassRepr> p : overridingMethods) {
final Iterable<File> fNames = classToSourceFileGet(p.second.name);
if (fNames != null) {
if (fNames != null && !containsAll(myCompiledFiles, fNames)) {
ContainerUtil.addAll(myAffectedFiles, fNames);
if (myDebugS.isDebugEnabled()) {
for (File fName : fNames) {
@@ -1380,7 +1380,7 @@ public final class Mappings {
continue;
}
if (cc.name == it.name) {
if (cc.name == it.name || !pp.first.equals(removedMethod) /*need exact match*/) {
continue;
}

2
jps/jps-builders/src/org/jetbrains/jps/dependency/java/JavaDifferentiateStrategy.java
View File

@@ -374,7 +374,7 @@ public final class JavaDifferentiateStrategy implements DifferentiateStrategy {
for (JvmNodeReferenceID id : propagated) {
for (JvmClass subClass : future.getNodes(id, JvmClass.class)) {
Iterable<Pair<JvmClass, JvmMethod>> overriddenForSubclass = future.getOverriddenMethods(subClass, removedMethod::isSameByJavaRules);
boolean allOverriddenAbstract = !Iterators.isEmpty(overriddenForSubclass) && Iterators.isEmpty(Iterators.filter(overriddenForSubclass, p -> !p.getSecond().isAbstract()));
boolean allOverriddenAbstract = !Iterators.isEmpty(overriddenForSubclass) && Iterators.isEmpty(Iterators.filter(overriddenForSubclass, p -> removedMethod.isSame(p.getSecond()) && !p.getSecond().isAbstract()));
if (allOverriddenAbstract || future.inheritsFromLibraryClass(subClass)) {
debug("Removed method is not abstract & overrides some abstract method which is not then over-overridden in subclass " + subClass.getName());
for (NodeSource source : context.getGraph().getSources(subClass.getReferenceID())) {

28
jps/jps-builders/testSrc/org/jetbrains/ether/GenericTest.java
View File

@@ -1,18 +1,4 @@
/*
* Copyright 2000-2012 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.ether;
public class GenericTest extends IncrementalTestCase {
@@ -76,11 +62,17 @@ public class GenericTest extends IncrementalTestCase {
doTest();
}
/* Not working yet
public void testChangeToCovariantMethodInBase3() throws Exception {
public void testChangeToCovariantMethodInBase3() {
// Strictly speaking, recompilation of "IImpl" is not necessary, since all needed bridge methods will be included by the compiler into its base "Mediator" class (see the test's classes).
// However, at the moment when decision is made, both Mediator and IImpl do not have necessary bridge methods, so the corresponding rule affects both classes.
// At the moment we assume that it is fine to recompile more classes rather than make the rule to be more complicated.
doTest();
}
*/
public void testChangeToCovariantMethodInBase4() {
doTest();
}
public void testChangeVarargSignature() {
doTest();
}