eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2025-01-06 15:14:11 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix first-time instantiation via reflection.

Browse Source 
In 7fc035f, a general fix to instantiation via reflection was made and a
test case added. The test case fails due to a separate issue, solved in
this commit, which affects only the first instantiation via reflection.
This commit is contained in:
Davin McCall 2017-02-09 14:53:26 +00:00
parent 7fc035fd8a
commit 3d0dee98be
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
platform/src/main/java/org/teavm/platform/Platform.java
View File

@ -33,6 +33,8 @@ public final class Platform {
private Platform() { private Platform() {
} }
private static boolean newInstancePrepared;
@InjectedBy(PlatformGenerator.class) @InjectedBy(PlatformGenerator.class)
public static native PlatformObject getPlatformObject(Object obj); public static native PlatformObject getPlatformObject(Object obj);
@ -85,7 +87,10 @@ public final class Platform {
public static native int nextObjectId(); public static native int nextObjectId();
public static <T> T newInstance(PlatformClass cls) { public static <T> T newInstance(PlatformClass cls) {
prepareNewInstance(); if (!newInstancePrepared) {
prepareNewInstance();
newInstancePrepared = true;
}
return newInstanceImpl(cls); return newInstanceImpl(cls);
} }

3
platform/src/main/java/org/teavm/platform/plugin/PlatformGenerator.java
View File

@ -117,9 +117,6 @@ public class PlatformGenerator implements Generator, Injector, DependencyPlugin
.appendMethodBody(method.getReference()).append(";").softNewLine(); .appendMethodBody(method.getReference()).append(";").softNewLine();
} }
} }
writer.appendMethodBody(Platform.class, "newInstance", PlatformClass.class, Object.class).ws().append('=').ws()
.appendMethodBody(Platform.class, "newInstanceImpl", PlatformClass.class, Object.class)
.append(";").softNewLine();
} }
private void generateNewInstance(GeneratorContext context, SourceWriter writer) throws IOException { private void generateNewInstance(GeneratorContext context, SourceWriter writer) throws IOException {