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

Fix displaying diagnostics in out-of-process mode

Browse Source
This commit is contained in:
Alexey Andreev 2019-05-14 14:46:44 +03:00
parent 3d96616761
commit ca50f72fe9
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/org/teavm/model/MethodDescriptor.java
View File

@ -15,12 +15,13 @@
*/ */
package org.teavm.model; package org.teavm.model;
import java.io.Serializable;
import java.util.Arrays; import java.util.Arrays;
public class MethodDescriptor { public class MethodDescriptor implements Serializable {
private String name; private String name;
private ValueType[] signature; private ValueType[] signature;
private int hash; private transient int hash;
public MethodDescriptor(String name, ValueType... signature) { public MethodDescriptor(String name, ValueType... signature) {
if (signature.length < 1) { if (signature.length < 1) {

4
core/src/main/java/org/teavm/model/MethodReference.java
View File

@ -35,8 +35,8 @@ import java.util.stream.Stream;
*/ */
public class MethodReference implements Serializable { public class MethodReference implements Serializable {
private String className; private String className;
private transient MethodDescriptor descriptor; private MethodDescriptor descriptor;
private int hash; private transient int hash;
public MethodReference(String className, MethodDescriptor descriptor) { public MethodReference(String className, MethodDescriptor descriptor) {
this.className = className; this.className = className;

4
core/src/main/java/org/teavm/model/ValueType.java
View File

@ -27,7 +27,7 @@ public abstract class ValueType implements Serializable {
public static class Object extends ValueType { public static class Object extends ValueType {
private String className; private String className;
private int hash; private transient int hash;
public Object(String className) { public Object(String className) {
this.className = className; this.className = className;
@ -126,7 +126,7 @@ public abstract class ValueType implements Serializable {
public static class Array extends ValueType { public static class Array extends ValueType {
private ValueType itemType; private ValueType itemType;
private int hash; private transient int hash;
public Array(ValueType itemType) { public Array(ValueType itemType) {
this.itemType = itemType; this.itemType = itemType;

2
jso/impl/src/main/java/org/teavm/jso/impl/JSClassProcessor.java
View File

@ -365,7 +365,7 @@ class JSClassProcessor {
boolean returnByRef = method.getAnnotations().get(JSByRef.class.getName()) != null; boolean returnByRef = method.getAnnotations().get(JSByRef.class.getName()) != null;
if (returnByRef && !typeHelper.isSupportedByRefType(method.getResultType())) { if (returnByRef && !typeHelper.isSupportedByRefType(method.getResultType())) {
diagnostics.error(callLocation, "Method {{m0}} is marked with @JSByRef, but does not return valid " diagnostics.error(callLocation, "Method {{m0}} is marked with @JSByRef, but does not return valid "
+ "array type"); + "array type", method.getReference());
return false; return false;
} }