This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 103a9a55dd Regenerate after jextract updates
103a9a55dd is described below
commit 103a9a55dd9ba6746a2f7684d001cc1067701b25
Author: remm <[email protected]>
AuthorDate: Fri Feb 24 09:24:59 2023 +0100
Regenerate after jextract updates
No real change.
---
.../apache/tomcat/util/openssl/RuntimeHelper.java | 17 ++++++++++++-----
.../SSL_CTX_set_cert_verify_callback$cb.java | 4 ++--
.../openssl/SSL_CTX_set_tmp_dh_callback$dh.java | 4 ++--
.../util/openssl/SSL_set_info_callback$cb.java | 4 ++--
.../apache/tomcat/util/openssl/constants$15.java | 13 +++++++++++--
.../apache/tomcat/util/openssl/constants$21.java | 21 +++++++++++++++++++--
.../apache/tomcat/util/openssl/constants$22.java | 6 +++---
.../apache/tomcat/util/openssl/constants$29.java | 2 +-
.../org/apache/tomcat/util/openssl/openssl_h.java | 2 +-
9 files changed, 53 insertions(+), 20 deletions(-)
diff --git
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/RuntimeHelper.java
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/RuntimeHelper.java
index ad46c35012..5b0fbb4521 100644
---
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/RuntimeHelper.java
+++
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/RuntimeHelper.java
@@ -89,18 +89,25 @@ final class RuntimeHelper {
orElse(null);
}
- static <Z> MemorySegment upcallStub(Class<Z> fi, Z z, FunctionDescriptor
fdesc, Arena scope) {
+ static MethodHandle upcallHandle(Class<?> fi, String name,
FunctionDescriptor fdesc) {
try {
- MethodHandle handle = MH_LOOKUP.findVirtual(fi, "apply",
fdesc.toMethodType());
- handle = handle.bindTo(z);
- return LINKER.upcallStub(handle, fdesc, scope);
+ return MH_LOOKUP.findVirtual(fi, name, fdesc.toMethodType());
+ } catch (Throwable ex) {
+ throw new AssertionError(ex);
+ }
+ }
+
+ static <Z> MemorySegment upcallStub(MethodHandle fiHandle, Z z,
FunctionDescriptor fdesc, Arena scope) {
+ try {
+ fiHandle = fiHandle.bindTo(z);
+ return LINKER.upcallStub(fiHandle, fdesc, scope);
} catch (Throwable ex) {
throw new AssertionError(ex);
}
}
static MemorySegment asArray(MemorySegment addr, MemoryLayout layout, int
numElements, Arena arena) {
- return addr.reinterpret(numElements * layout.byteSize(),
arena.scope(), null);
+ return addr.reinterpret(numElements * layout.byteSize(),
arena.scope(), null);
}
// Internals only below this point
diff --git
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/SSL_CTX_set_cert_verify_callback$cb.java
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/SSL_CTX_set_cert_verify_callback$cb.java
index 3f88ab4832..939f42c600 100644
---
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/SSL_CTX_set_cert_verify_callback$cb.java
+++
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/SSL_CTX_set_cert_verify_callback$cb.java
@@ -33,13 +33,13 @@ public interface SSL_CTX_set_cert_verify_callback$cb {
int apply(java.lang.foreign.MemorySegment _x0,
java.lang.foreign.MemorySegment _x1);
static MemorySegment allocate(SSL_CTX_set_cert_verify_callback$cb fi,
Arena scope) {
- return
RuntimeHelper.upcallStub(SSL_CTX_set_cert_verify_callback$cb.class, fi,
constants$15.SSL_CTX_set_cert_verify_callback$cb$FUNC, scope);
+ return
RuntimeHelper.upcallStub(constants$15.SSL_CTX_set_cert_verify_callback$cb_UP$MH,
fi, constants$15.SSL_CTX_set_cert_verify_callback$cb$FUNC, scope);
}
static SSL_CTX_set_cert_verify_callback$cb ofAddress(MemorySegment addr,
Arena arena) {
MemorySegment symbol = addr.reinterpret(arena.scope(), null);
return (java.lang.foreign.MemorySegment __x0,
java.lang.foreign.MemorySegment __x1) -> {
try {
- return
(int)constants$15.SSL_CTX_set_cert_verify_callback$cb$MH.invokeExact(symbol,
__x0, __x1);
+ return
(int)constants$15.SSL_CTX_set_cert_verify_callback$cb_DOWN$MH.invokeExact(symbol,
__x0, __x1);
} catch (Throwable ex$) {
throw new AssertionError("should not reach here", ex$);
}
diff --git
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/SSL_CTX_set_tmp_dh_callback$dh.java
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/SSL_CTX_set_tmp_dh_callback$dh.java
index 88229dc469..674e8ec228 100644
---
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/SSL_CTX_set_tmp_dh_callback$dh.java
+++
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/SSL_CTX_set_tmp_dh_callback$dh.java
@@ -33,13 +33,13 @@ public interface SSL_CTX_set_tmp_dh_callback$dh {
java.lang.foreign.MemorySegment apply(java.lang.foreign.MemorySegment _x0,
int _x1, int _x2);
static MemorySegment allocate(SSL_CTX_set_tmp_dh_callback$dh fi, Arena
scope) {
- return RuntimeHelper.upcallStub(SSL_CTX_set_tmp_dh_callback$dh.class,
fi, constants$21.SSL_CTX_set_tmp_dh_callback$dh$FUNC, scope);
+ return
RuntimeHelper.upcallStub(constants$21.SSL_CTX_set_tmp_dh_callback$dh_UP$MH, fi,
constants$21.SSL_CTX_set_tmp_dh_callback$dh$FUNC, scope);
}
static SSL_CTX_set_tmp_dh_callback$dh ofAddress(MemorySegment addr, Arena
arena) {
MemorySegment symbol = addr.reinterpret(arena.scope(), null);
return (java.lang.foreign.MemorySegment __x0, int __x1, int __x2) -> {
try {
- return
(java.lang.foreign.MemorySegment)constants$22.SSL_CTX_set_tmp_dh_callback$dh$MH.invokeExact(symbol,
__x0, __x1, __x2);
+ return
(java.lang.foreign.MemorySegment)constants$22.SSL_CTX_set_tmp_dh_callback$dh_DOWN$MH.invokeExact(symbol,
__x0, __x1, __x2);
} catch (Throwable ex$) {
throw new AssertionError("should not reach here", ex$);
}
diff --git
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/SSL_set_info_callback$cb.java
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/SSL_set_info_callback$cb.java
index 8b5748f4eb..5811cf2994 100644
---
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/SSL_set_info_callback$cb.java
+++
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/SSL_set_info_callback$cb.java
@@ -33,13 +33,13 @@ public interface SSL_set_info_callback$cb {
void apply(java.lang.foreign.MemorySegment _x0, int _x1, int _x2);
static MemorySegment allocate(SSL_set_info_callback$cb fi, Arena scope) {
- return RuntimeHelper.upcallStub(SSL_set_info_callback$cb.class, fi,
constants$21.SSL_set_info_callback$cb$FUNC, scope);
+ return
RuntimeHelper.upcallStub(constants$21.SSL_set_info_callback$cb_UP$MH, fi,
constants$21.SSL_set_info_callback$cb$FUNC, scope);
}
static SSL_set_info_callback$cb ofAddress(MemorySegment addr, Arena arena)
{
MemorySegment symbol = addr.reinterpret(arena.scope(), null);
return (java.lang.foreign.MemorySegment __x0, int __x1, int __x2) -> {
try {
- constants$21.SSL_set_info_callback$cb$MH.invokeExact(symbol,
__x0, __x1, __x2);
+
constants$21.SSL_set_info_callback$cb_DOWN$MH.invokeExact(symbol, __x0, __x1,
__x2);
} catch (Throwable ex$) {
throw new AssertionError("should not reach here", ex$);
}
diff --git
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/constants$15.java
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/constants$15.java
index a7b8649446..a3a26ec317 100644
---
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/constants$15.java
+++
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/constants$15.java
@@ -63,8 +63,17 @@ final class constants$15 {
Constants$root.C_POINTER$LAYOUT,
Constants$root.C_POINTER$LAYOUT
);
- static final MethodHandle SSL_CTX_set_cert_verify_callback$cb$MH =
RuntimeHelper.downcallHandle(
- constants$15.SSL_CTX_set_cert_verify_callback$cb$FUNC
+ static final FunctionDescriptor
SSL_CTX_set_cert_verify_callback$cb_UP$FUNC =
FunctionDescriptor.of(Constants$root.C_INT$LAYOUT,
+ Constants$root.C_POINTER$LAYOUT,
+ Constants$root.C_POINTER$LAYOUT
+ );
+ static final MethodHandle SSL_CTX_set_cert_verify_callback$cb_UP$MH =
RuntimeHelper.upcallHandle(SSL_CTX_set_cert_verify_callback$cb.class, "apply",
constants$15.SSL_CTX_set_cert_verify_callback$cb_UP$FUNC);
+ static final FunctionDescriptor
SSL_CTX_set_cert_verify_callback$cb_DOWN$FUNC =
FunctionDescriptor.of(Constants$root.C_INT$LAYOUT,
+ Constants$root.C_POINTER$LAYOUT,
+ Constants$root.C_POINTER$LAYOUT
+ );
+ static final MethodHandle SSL_CTX_set_cert_verify_callback$cb_DOWN$MH =
RuntimeHelper.downcallHandle(
+ constants$15.SSL_CTX_set_cert_verify_callback$cb_DOWN$FUNC
);
}
diff --git
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/constants$21.java
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/constants$21.java
index 5ce5412ad2..0832c55217 100644
---
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/constants$21.java
+++
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/constants$21.java
@@ -33,8 +33,19 @@ final class constants$21 {
Constants$root.C_INT$LAYOUT,
Constants$root.C_INT$LAYOUT
);
- static final MethodHandle SSL_set_info_callback$cb$MH =
RuntimeHelper.downcallHandle(
- constants$21.SSL_set_info_callback$cb$FUNC
+ static final FunctionDescriptor SSL_set_info_callback$cb_UP$FUNC =
FunctionDescriptor.ofVoid(
+ Constants$root.C_POINTER$LAYOUT,
+ Constants$root.C_INT$LAYOUT,
+ Constants$root.C_INT$LAYOUT
+ );
+ static final MethodHandle SSL_set_info_callback$cb_UP$MH =
RuntimeHelper.upcallHandle(SSL_set_info_callback$cb.class, "apply",
constants$21.SSL_set_info_callback$cb_UP$FUNC);
+ static final FunctionDescriptor SSL_set_info_callback$cb_DOWN$FUNC =
FunctionDescriptor.ofVoid(
+ Constants$root.C_POINTER$LAYOUT,
+ Constants$root.C_INT$LAYOUT,
+ Constants$root.C_INT$LAYOUT
+ );
+ static final MethodHandle SSL_set_info_callback$cb_DOWN$MH =
RuntimeHelper.downcallHandle(
+ constants$21.SSL_set_info_callback$cb_DOWN$FUNC
);
static final FunctionDescriptor SSL_set_info_callback$FUNC =
FunctionDescriptor.ofVoid(
Constants$root.C_POINTER$LAYOUT,
@@ -62,6 +73,12 @@ final class constants$21 {
Constants$root.C_INT$LAYOUT,
Constants$root.C_INT$LAYOUT
);
+ static final FunctionDescriptor SSL_CTX_set_tmp_dh_callback$dh_UP$FUNC =
FunctionDescriptor.of(Constants$root.C_POINTER$LAYOUT,
+ Constants$root.C_POINTER$LAYOUT,
+ Constants$root.C_INT$LAYOUT,
+ Constants$root.C_INT$LAYOUT
+ );
+ static final MethodHandle SSL_CTX_set_tmp_dh_callback$dh_UP$MH =
RuntimeHelper.upcallHandle(SSL_CTX_set_tmp_dh_callback$dh.class, "apply",
constants$21.SSL_CTX_set_tmp_dh_callback$dh_UP$FUNC);
}
diff --git
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/constants$22.java
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/constants$22.java
index 47a4fc9d00..6b2c032610 100644
---
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/constants$22.java
+++
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/constants$22.java
@@ -28,13 +28,13 @@ final class constants$22 {
// Suppresses default constructor, ensuring non-instantiability.
private constants$22() {}
- static final FunctionDescriptor SSL_CTX_set_tmp_dh_callback$dh$FUNC =
FunctionDescriptor.of(Constants$root.C_POINTER$LAYOUT,
+ static final FunctionDescriptor SSL_CTX_set_tmp_dh_callback$dh_DOWN$FUNC =
FunctionDescriptor.of(Constants$root.C_POINTER$LAYOUT,
Constants$root.C_POINTER$LAYOUT,
Constants$root.C_INT$LAYOUT,
Constants$root.C_INT$LAYOUT
);
- static final MethodHandle SSL_CTX_set_tmp_dh_callback$dh$MH =
RuntimeHelper.downcallHandle(
- constants$22.SSL_CTX_set_tmp_dh_callback$dh$FUNC
+ static final MethodHandle SSL_CTX_set_tmp_dh_callback$dh_DOWN$MH =
RuntimeHelper.downcallHandle(
+ constants$22.SSL_CTX_set_tmp_dh_callback$dh_DOWN$FUNC
);
static final FunctionDescriptor SSL_CTX_set_tmp_dh_callback$FUNC =
FunctionDescriptor.ofVoid(
Constants$root.C_POINTER$LAYOUT,
diff --git
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/constants$29.java
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/constants$29.java
index a473a79cba..71ff4b643e 100644
---
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/constants$29.java
+++
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/constants$29.java
@@ -28,7 +28,7 @@ final class constants$29 {
// Suppresses default constructor, ensuring non-instantiability.
private constants$29() {}
- static final MemorySegment OPENSSL_FILE$SEGMENT =
RuntimeHelper.CONSTANT_ALLOCATOR.allocateUtf8String("/tmp/jextract$13590800042373814498.h");
+ static final MemorySegment OPENSSL_FILE$SEGMENT =
RuntimeHelper.CONSTANT_ALLOCATOR.allocateUtf8String("/tmp/jextract$5975327931591344605.h");
}
diff --git
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/openssl_h.java
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/openssl_h.java
index 558787b1b0..a22ebdb52c 100644
---
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/openssl_h.java
+++
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/openssl_h.java
@@ -3300,7 +3300,7 @@ public class openssl_h {
}
/**
* {@snippet :
- * #define OPENSSL_FILE "/tmp/jextract$13590800042373814498.h"
+ * #define OPENSSL_FILE "/tmp/jextract$5975327931591344605.h"
* }
*/
public static MemorySegment OPENSSL_FILE() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
