archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 23:04:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8318586: Explicitly handle upcall stub allocation failure

Browse source 
8318653: UpcallTestHelper::runInNewProcess waits for forked process without timeout

Reviewed-by: shade, mcimadamore
This commit is contained in:
Jorn Vernee 2023-11-30 19:26:54 +00:00
parent 630bafd9c6
commit e96e191952
21 changed files with 207 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/java.base/share/classes/jdk/internal/foreign/abi/NativeEntryPoint.java
View file

@ -71,6 +71,9 @@ public class NativeEntryPoint {
return NEP_CACHE.get(key, k -> {
long downcallStub = makeDowncallStub(methodType, abi, argMoves, returnMoves, needsReturnBuffer,
capturedStateMask, needsTransition);
if (downcallStub == 0) {
throw new OutOfMemoryError("Failed to allocate downcall stub");
}
NativeEntryPoint nep = new NativeEntryPoint(methodType, downcallStub);
CLEANER.register(nep, () -> freeDowncallStub(downcallStub));
return nep;

3
src/java.base/share/classes/jdk/internal/foreign/abi/UpcallLinker.java
View file

@ -106,6 +106,9 @@ public class UpcallLinker {
doBindings = insertArguments(exactInvoker(doBindings.type()), 0, doBindings);
long entryPoint = makeUpcallStub(doBindings, abi, conv,
callingSequence.needsReturnBuffer(), callingSequence.returnBufferSize());
if (entryPoint == 0) {
throw new OutOfMemoryError("Failed to allocate upcall stub");
}
return UpcallStubs.makeUpcall(entryPoint, scope);
};
}