mirror/teavm
2
0
Fork 0
mirror of https://github.com/konsoletyper/teavm.git synced 2024-11-27 01:30:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

C/Wasm: fix issue in GC

Browse Source
This commit is contained in:
Alexey Andreev 2021-12-16 18:39:26 +03:00
parent 15466bad93
commit ce5e3bfeb7
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/main/java/org/teavm/runtime/GC.java
View File

@ -115,12 +115,21 @@ public final class GC {
return; return;
} }
collectGarbageImpl(size); collectGarbageImpl(size);
if (currentChunk.size != size && currentChunk.size <= size + MIN_CHUNK_SIZE && !getNextChunkIfPossible(size)) { if (!hasAvailableMemory(size)) {
ExceptionHandling.printStack(); collectGarbageFullImpl(size);
outOfMemory(); if (!hasAvailableMemory(size)) {
ExceptionHandling.printStack();
outOfMemory();
}
} }
} }
private static boolean hasAvailableMemory(int size) {
return currentChunk.size == size
|| currentChunk.size > size + MIN_CHUNK_SIZE
|| getNextChunkIfPossible(size);
}
private static boolean getNextChunkIfPossible(int size) { private static boolean getNextChunkIfPossible(int size) {
while (true) { while (true) {
if (currentChunk.toAddress().isLessThan(currentChunkLimit)) { if (currentChunk.toAddress().isLessThan(currentChunkLimit)) {