eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2024-12-22 08:14:09 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix diagnostics no printed from teavm-cli. Fix diagnostics of unavailable classes and methods

Browse Source
This commit is contained in:
Alexey Andreev 2018-12-09 19:54:04 +03:00
parent d74bcbe2b9
commit 952ed3f193
4 changed files with 32 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/main/java/org/teavm/dependency/DependencyAnalyzer.java
View File

@ -436,6 +436,7 @@ public abstract class DependencyAnalyzer implements DependencyInfo {
MethodDependency dep = getMethodDependency(className, descriptor);
if (!dep.activated) {
reachedMethods.add(dep.getReference());
dep.activated = true;
if (!dep.isMissing()) {
for (DependencyListener listener : listeners) {

111
core/src/main/java/org/teavm/model/util/MissingItemsProcessor.java
View File

@ -194,11 +194,7 @@ public class MissingItemsProcessor {
return true;
}
private InstructionVisitor instructionProcessor = new InstructionVisitor() {
@Override
public void visit(NullCheckInstruction insn) {
}
private InstructionVisitor instructionProcessor = new AbstractInstructionVisitor() {
@Override
public void visit(InitClassInstruction insn) {
checkClass(insn.getLocation(), insn.getClassName());
@ -218,30 +214,6 @@ public class MissingItemsProcessor {
}
}
@Override
public void visit(InvokeDynamicInstruction insn) {
}
@Override
public void visit(PutElementInstruction insn) {
}
@Override
public void visit(GetElementInstruction insn) {
}
@Override
public void visit(UnwrapArrayInstruction insn) {
}
@Override
public void visit(CloneArrayInstruction insn) {
}
@Override
public void visit(ArrayLengthInstruction insn) {
}
@Override
public void visit(PutFieldInstruction insn) {
checkField(insn.getLocation(), insn.getField());
@ -267,94 +239,13 @@ public class MissingItemsProcessor {
checkClass(insn.getLocation(), insn.getItemType());
}
@Override
public void visit(RaiseInstruction insn) {
}
@Override
public void visit(ExitInstruction insn) {
}
@Override
public void visit(SwitchInstruction insn) {
}
@Override
public void visit(JumpInstruction insn) {
}
@Override
public void visit(BinaryBranchingInstruction insn) {
}
@Override
public void visit(BranchingInstruction insn) {
}
@Override
public void visit(CastIntegerInstruction insn) {
}
@Override
public void visit(CastNumberInstruction insn) {
}
@Override
public void visit(CastInstruction insn) {
checkClass(insn.getLocation(), insn.getTargetType());
}
@Override
public void visit(AssignInstruction insn) {
}
@Override
public void visit(NegateInstruction insn) {
}
@Override
public void visit(BinaryInstruction insn) {
}
@Override
public void visit(StringConstantInstruction insn) {
}
@Override
public void visit(DoubleConstantInstruction insn) {
}
@Override
public void visit(FloatConstantInstruction insn) {
}
@Override
public void visit(LongConstantInstruction insn) {
}
@Override
public void visit(IntegerConstantInstruction insn) {
}
@Override
public void visit(NullConstantInstruction insn) {
}
@Override
public void visit(ClassConstantInstruction insn) {
checkClass(insn.getLocation(), insn.getConstant());
}
@Override
public void visit(EmptyInstruction insn) {
}
@Override
public void visit(MonitorEnterInstruction insn) {
}
@Override
public void visit(MonitorExitInstruction insn) {
}
};
}

27
tools/cli/pom.xml
View File

@ -57,6 +57,33 @@
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-util</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.carrotsearch</groupId>
<artifactId>hppc</artifactId>
<version>0.7.3</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.mozilla</groupId>
<artifactId>rhino</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
<build>

3
tools/cli/src/main/java/org/teavm/cli/TeaVMRunner.java
View File

@ -46,6 +46,7 @@ import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.PosixParser;
import org.teavm.backend.wasm.render.WasmBinaryVersion;
import org.teavm.tooling.TeaVMProblemRenderer;
import org.teavm.tooling.TeaVMTargetType;
import org.teavm.tooling.TeaVMTool;
import org.teavm.tooling.TeaVMToolException;
@ -535,6 +536,8 @@ public final class TeaVMRunner {
phaseStartTime = System.currentTimeMillis();
tool.generate();
reportPhaseComplete();
TeaVMProblemRenderer.describeProblems(tool.getDependencyInfo().getCallGraph(), tool.getProblemProvider(), log);
log.flush();
System.out.println("Build complete for " + ((System.currentTimeMillis() - startTime) / 1000.0) + " seconds");
}