Skip to content

Commit 519f4b7

Browse files
committed
Reduce the number of RMI calls during external compilation
1 parent 623aa90 commit 519f4b7

31 files changed

Lines changed: 1235 additions & 257 deletions

File tree

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package saker.java.compiler.jdk.impl.model;
2+
3+
import saker.java.compiler.util9.impl.model.ForwardingElements9;
4+
5+
public abstract class ForwardingElements extends ForwardingElements9 {
6+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package saker.java.compiler.jdk.impl.model;
2+
3+
import saker.java.compiler.util9.impl.model.ForwardingElements9;
4+
5+
public abstract class ForwardingElements extends ForwardingElements9 {
6+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package saker.java.compiler.jdk.impl.model;
2+
3+
import saker.java.compiler.util9.impl.model.ForwardingElements9;
4+
5+
public abstract class ForwardingElements extends ForwardingElements9 {
6+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package saker.java.compiler.jdk.impl.model;
2+
3+
import saker.java.compiler.util9.impl.model.ForwardingElements9;
4+
5+
public abstract class ForwardingElements extends ForwardingElements9 {
6+
}

impl-jdk16/src/main/saker/java/compiler/jdk/impl/JavaCompilationUtils.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package saker.java.compiler.jdk.impl;
1717

18-
import java.util.Collections;
1918
import java.util.List;
2019

2120
import javax.lang.model.element.Element;
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package saker.java.compiler.jdk.impl.model;
2+
3+
import saker.java.compiler.util16.impl.model.ForwardingElements16;
4+
5+
public abstract class ForwardingElements extends ForwardingElements16 {
6+
}

impl-jdk8/src/main/saker/java/compiler/jdk/impl/invoker/InternalIncrementalCompilationInvoker.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,9 @@
7373

7474
public class InternalIncrementalCompilationInvoker extends InternalIncrementalCompilationInvokerBase {
7575
@Override
76-
public void initCompilation(JavaCompilerInvocationDirector director, IncrementalDirectoryPaths directorypaths,
77-
String[] optionsarray, String sourceversionoptionname, String targetversionoptionname) throws IOException {
76+
public CompilationInitResultData initCompilation(JavaCompilerInvocationDirector director,
77+
IncrementalDirectoryPaths directorypaths, String[] optionsarray, String sourceversionoptionname,
78+
String targetversionoptionname) throws IOException {
7879
super.initCompilation(director, directorypaths, optionsarray, sourceversionoptionname, targetversionoptionname);
7980

8081
//we're running on java 8, a different invoker is instantiated for 9+
@@ -144,6 +145,8 @@ public void initCompilation(JavaCompilerInvocationDirector director, Incremental
144145
javac.genEndPos = true;
145146

146147
super.sourceVersion = Source.toSourceVersion(Source.instance(context));
148+
149+
return new CompilationInitResultData(getSourceVersionName());
147150
}
148151

149152
private Context createJavacFileManagerContext() {
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package saker.java.compiler.jdk.impl.model;
2+
3+
import saker.java.compiler.util8.impl.model.ForwardingElements8;
4+
5+
public abstract class ForwardingElements extends ForwardingElements8 {
6+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package saker.java.compiler.jdk.impl.model;
2+
3+
import saker.java.compiler.util9.impl.model.ForwardingElements9;
4+
5+
public abstract class ForwardingElements extends ForwardingElements9 {
6+
}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package saker.java.compiler.util16.impl.model;
2+
3+
import javax.lang.model.element.ExecutableElement;
4+
import javax.lang.model.element.RecordComponentElement;
5+
6+
import saker.java.compiler.util9.impl.model.ForwardingElements9;
7+
8+
public abstract class ForwardingElements16 extends ForwardingElements9 {
9+
10+
protected ForwardingElements16() {
11+
super();
12+
}
13+
14+
@Override
15+
public RecordComponentElement recordComponentFor(ExecutableElement accessor) {
16+
return getForwardedElements().recordComponentFor(accessor);
17+
}
18+
}

0 commit comments

Comments
 (0)