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

Fix bootstrap compiler

Browse Source
This commit is contained in:
Alexey Andreev 2018-12-03 14:35:36 +03:00
parent 3209909c8b
commit eaf0f5a24e
6 changed files with 290 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
classlib/src/main/java/org/teavm/classlib/impl/ServiceLoaderSupport.java
View File

@ -27,6 +27,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.ServiceLoader;
import java.util.Set;
import org.teavm.backend.javascript.codegen.SourceWriter;
import org.teavm.backend.javascript.spi.Generator;
@ -126,12 +127,14 @@ public class ServiceLoaderSupport extends AbstractDependencyListener implements
}
@Override
public void methodReached(final DependencyAgent agent, MethodDependency method, final CallLocation location) {
public void methodReached(DependencyAgent agent, MethodDependency method, CallLocation location) {
MethodReference ref = method.getReference();
if (ref.getClassName().equals("java.util.ServiceLoader") && ref.getName().equals("loadServices")) {
method.getResult().propagate(agent.getType("[Ljava/lang/Object;"));
allClassesNode.connect(method.getResult().getArrayItem());
method.getResult().getArrayItem().addConsumer(type -> initConstructor(agent, type.getName(), location));
DependencyNode sourceNode = agent.linkMethod(new MethodReference(ServiceLoader.class, "load", Class.class,
ServiceLoader.class), null).getVariable(1).getClassValueNode();
sourceNode.connect(method.getResult().getArrayItem());
sourceNode.addConsumer(type -> initConstructor(agent, type.getName(), location));
}
}

25
classlib/src/main/java/org/teavm/classlib/java/security/TAccessController.java Normal file
View File

@ -0,0 +1,25 @@
/*
* Copyright 2018 Alexey Andreev.
*
* 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.
*/
package org.teavm.classlib.java.security;
public final class TAccessController {
private TAccessController() {
}
public static <T> T doPrivileged(TPrivilegedAction<T> action) {
return action.run();
}
}

20
classlib/src/main/java/org/teavm/classlib/java/security/TPrivilegedAction.java Normal file
View File

@ -0,0 +1,20 @@
/*
* Copyright 2018 Alexey Andreev.
*
* 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.
*/
package org.teavm.classlib.java.security;
public interface TPrivilegedAction<T> {
T run();
}

58
classlib/src/main/java/org/teavm/classlib/java/util/concurrent/atomic/TAtomicInteger.java
View File

@ -21,6 +21,7 @@ import java.util.function.IntUnaryOperator;
public class TAtomicInteger extends Number implements Serializable {
private int value;
private int version;
public TAtomicInteger() {
}
@ -35,15 +36,18 @@ public class TAtomicInteger extends Number implements Serializable {
public final void set(int newValue) {
value = newValue;
version++;
}
public final void lazySet(int newValue) {
value = newValue;
version++;
}
public final int getAndSet(int newValue) {
int result = value;
value = newValue;
version++;
return result;
}
@ -52,6 +56,7 @@ public class TAtomicInteger extends Number implements Serializable {
return false;
}
value = update;
version++;
return true;
}
@ -60,56 +65,93 @@ public class TAtomicInteger extends Number implements Serializable {
return false;
}
value = update;
version++;
return true;
}
public final int getAndIncrement() {
version++;
return value++;
}
public final int getAndDecrement() {
version++;
return value--;
}
public final int getAndAdd(int delta) {
version++;
int result = value;
value += delta;
return result;
}
public final int incrementAndGet() {
version++;
return ++value;
}
public final int decrementAndGet() {
version++;
return --value;
}
public final int addAndGet(int delta) {
version++;
value += delta;
return value;
}
public final int getAndUpdate(IntUnaryOperator updateFunction) {
int result = value;
value = updateFunction.applyAsInt(value);
int expectedVersion;
int result;
int newValue;
do {
expectedVersion = version;
result = value;
newValue = updateFunction.applyAsInt(value);
} while (expectedVersion != version);
++version;
value = newValue;
return result;
}
public final int updateAndGet(IntUnaryOperator updateFunction) {
value = updateFunction.applyAsInt(value);
return value;
int expectedVersion;
int newValue;
do {
expectedVersion = version;
newValue = updateFunction.applyAsInt(value);
} while (expectedVersion != version);
++version;
value = newValue;
return newValue;
}
public final int getAndAccumulate(int x, IntBinaryOperator accumulatorFunction) {
int result = value;
value = accumulatorFunction.applyAsInt(value, x);
int expectedVersion;
int newValue;
int result;
do {
expectedVersion = version;
result = value;
newValue = accumulatorFunction.applyAsInt(value, x);
} while (expectedVersion != version);
++version;
value = newValue;
return result;
}
public final int accumulateAndGet(int x, IntBinaryOperator accumulatorFunction) {
value = accumulatorFunction.applyAsInt(value, x);
return value;
int expectedVersion;
int newValue;
do {
expectedVersion = version;
newValue = accumulatorFunction.applyAsInt(value, x);
} while (expectedVersion != version);
++version;
value = newValue;
return newValue;
}
@Override

181
classlib/src/main/java/org/teavm/classlib/java/util/concurrent/atomic/TAtomicLong.java Normal file
View File

@ -0,0 +1,181 @@
/*
* Copyright 2018 Alexey Andreev.
*
* 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.
*/
package org.teavm.classlib.java.util.concurrent.atomic;
import java.io.Serializable;
import java.util.function.LongBinaryOperator;
import java.util.function.LongUnaryOperator;
public class TAtomicLong extends Number implements Serializable {
private long value;
private int version;
public TAtomicLong() {
}
public TAtomicLong(long value) {
this.value = value;
}
public final long get() {
return value;
}
public final void set(long newValue) {
value = newValue;
version++;
}
public final void lazySet(long newValue) {
value = newValue;
version++;
}
public final long getAndSet(long newValue) {
long result = value;
value = newValue;
version++;
return result;
}
public final boolean compareAndSet(long expect, long update) {
if (value != expect) {
return false;
}
value = update;
version++;
return true;
}
public final boolean weakCompareAndSet(long expect, long update) {
if (value != expect) {
return false;
}
value = update;
version++;
return true;
}
public final long getAndIncrement() {
version++;
return value++;
}
public final long getAndDecrement() {
version++;
return value--;
}
public final long getAndAdd(long delta) {
version++;
long result = value;
value += delta;
return result;
}
public final long incrementAndGet() {
version++;
return ++value;
}
public final long decrementAndGet() {
version++;
return --value;
}
public final long addAndGet(long delta) {
version++;
value += delta;
return value;
}
public final long getAndUpdate(LongUnaryOperator updateFunction) {
int expectedVersion;
long result;
long newValue;
do {
expectedVersion = version;
result = value;
newValue = updateFunction.applyAsLong(value);
} while (expectedVersion != version);
++version;
value = newValue;
return result;
}
public final long updateAndGet(LongUnaryOperator updateFunction) {
int expectedVersion;
long newValue;
do {
expectedVersion = version;
newValue = updateFunction.applyAsLong(value);
} while (expectedVersion != version);
++version;
value = newValue;
return newValue;
}
public final long getAndAccumulate(long x, LongBinaryOperator accumulatorFunction) {
int expectedVersion;
long newValue;
long result;
do {
expectedVersion = version;
result = value;
newValue = accumulatorFunction.applyAsLong(value, x);
} while (expectedVersion != version);
++version;
value = newValue;
return result;
}
public final long accumulateAndGet(long x, LongBinaryOperator accumulatorFunction) {
int expectedVersion;
long newValue;
do {
expectedVersion = version;
newValue = accumulatorFunction.applyAsLong(value, x);
} while (expectedVersion != version);
++version;
value = newValue;
return newValue;
}
@Override
public String toString() {
return String.valueOf(value);
}
@Override
public int intValue() {
return (int) value;
}
@Override
public long longValue() {
return value;
}
@Override
public float floatValue() {
return value;
}
@Override
public double doubleValue() {
return value;
}
}

9
core/src/main/java/org/teavm/model/util/AsyncMethodFinder.java
View File

@ -49,6 +49,7 @@ public class AsyncMethodFinder {
private CallGraph callGraph;
private Diagnostics diagnostics;
private ListableClassReaderSource classSource;
private boolean hasAsyncMethods;
public AsyncMethodFinder(CallGraph callGraph, Diagnostics diagnostics) {
this.callGraph = callGraph;
@ -65,6 +66,7 @@ public class AsyncMethodFinder {
public void find(ListableClassReaderSource classSource) {
this.classSource = classSource;
hasAsyncMethods = hasAsyncMethods();
for (String clsName : classSource.getClassNames()) {
ClassReader cls = classSource.get(clsName);
for (MethodReader method : cls.getMethods()) {
@ -76,7 +78,7 @@ public class AsyncMethodFinder {
}
}
}
if (hasAsyncMethods()) {
if (hasAsyncMethods) {
for (String clsName : classSource.getClassNames()) {
ClassReader cls = classSource.get(clsName);
for (MethodReader method : cls.getMethods()) {
@ -169,6 +171,11 @@ public class AsyncMethodFinder {
+ "asynchronous methods:" + stack.toString(), methodRef);
}
}
if (!hasAsyncMethods && methodRef.getClassName().equals("java.lang.Object")
&& (methodRef.getName().equals("monitorEnter") || methodRef.getName().equals("monitorExit"))) {
return;
}
for (CallSite callSite : node.getCallerCallSites()) {
MethodReference nextMethod = callSite.getCaller().getMethod();
add(nextMethod, new CallStack(nextMethod, stack));