Fix @TargetClass naming convention violations in com.oracle.svm.truffle.nfi.posix

olpaw · olpaw · commit adde8dcfa1e9 · 2022-10-12T18:36:45.000+02:00
diff --git a/substratevm/src/com.oracle.svm.truffle.nfi.posix/src/com/oracle/svm/truffle/nfi/posix/PosixTruffleNFIFeature.java b/substratevm/src/com.oracle.svm.truffle.nfi.posix/src/com/oracle/svm/truffle/nfi/posix/PosixTruffleNFIFeature.java
@@ -110,7 +110,7 @@ private static PointerBase dlmopen(Lmid_t lmid, String filename, int mode) {
     @Platforms(Platform.LINUX.class)
     private static PointerBase loadLibraryInNamespace(long nativeContext, String name, int mode) {
         assert (mode & isolatedNamespaceFlag) == 0;
-        Target_com_oracle_truffle_nfi_backend_libffi_LibFFIContextLinux context = SubstrateUtil.cast(getContext(nativeContext), Target_com_oracle_truffle_nfi_backend_libffi_LibFFIContextLinux.class);
+        var context = SubstrateUtil.cast(getContext(nativeContext), Target_com_oracle_truffle_nfi_backend_libffi_LibFFIContext_Linux.class);
 
         // Double-checked locking on the NFI context instance.
         long namespaceId = context.isolatedNamespaceId;
diff --git a/substratevm/src/com.oracle.svm.truffle.nfi.posix/src/com/oracle/svm/truffle/nfi/posix/Target_com_oracle_truffle_nfi_backend_libffi_LibFFIContext_Linux.java b/substratevm/src/com.oracle.svm.truffle.nfi.posix/src/com/oracle/svm/truffle/nfi/posix/Target_com_oracle_truffle_nfi_backend_libffi_LibFFIContext_Linux.java
@@ -34,15 +34,15 @@
 
 @Platforms(Platform.LINUX.class)
 @TargetClass(className = "com.oracle.truffle.nfi.backend.libffi.LibFFIContext", onlyWith = TruffleNFIFeature.IsEnabled.class)
-final class Target_com_oracle_truffle_nfi_backend_libffi_LibFFIContextLinux {
+final class Target_com_oracle_truffle_nfi_backend_libffi_LibFFIContext_Linux {
 
     // Checkstyle: stop
     @Alias volatile long isolatedNamespaceId;
 
     @Alias @InjectAccessors(IsolatedAccessor.class) int ISOLATED_NAMESPACE;
 
     static class IsolatedAccessor {
-        static int getISOLATED_NAMESPACE(@SuppressWarnings("unused") Target_com_oracle_truffle_nfi_backend_libffi_LibFFIContextLinux ctx) {
+        static int getISOLATED_NAMESPACE(@SuppressWarnings("unused") Target_com_oracle_truffle_nfi_backend_libffi_LibFFIContext_Linux ctx) {
             return PosixTruffleNFISupport.isolatedNamespaceFlag;
         }
     }
diff --git a/substratevm/src/com.oracle.svm.truffle.nfi.posix/src/com/oracle/svm/truffle/nfi/posix/Target_com_oracle_truffle_nfi_backend_libffi_LibFFIContext_Posix.java b/substratevm/src/com.oracle.svm.truffle.nfi.posix/src/com/oracle/svm/truffle/nfi/posix/Target_com_oracle_truffle_nfi_backend_libffi_LibFFIContext_Posix.java
@@ -35,24 +35,24 @@
 
 @TargetClass(className = "com.oracle.truffle.nfi.backend.libffi.LibFFIContext", onlyWith = TruffleNFIFeature.IsEnabled.class)
 @Platforms({Platform.LINUX.class, Platform.DARWIN.class})
-final class Target_com_oracle_truffle_nfi_backend_libffi_LibFFIContextPosix {
+final class Target_com_oracle_truffle_nfi_backend_libffi_LibFFIContext_Posix {
 
     // Checkstyle: stop
     static class RTLDAccessor {
 
-        static int getRTLD_GLOBAL(@SuppressWarnings("unused") Target_com_oracle_truffle_nfi_backend_libffi_LibFFIContextPosix ctx) {
+        static int getRTLD_GLOBAL(@SuppressWarnings("unused") Target_com_oracle_truffle_nfi_backend_libffi_LibFFIContext_Posix ctx) {
             return Dlfcn.RTLD_GLOBAL();
         }
 
-        static int getRTLD_LOCAL(@SuppressWarnings("unused") Target_com_oracle_truffle_nfi_backend_libffi_LibFFIContextPosix ctx) {
+        static int getRTLD_LOCAL(@SuppressWarnings("unused") Target_com_oracle_truffle_nfi_backend_libffi_LibFFIContext_Posix ctx) {
             return Dlfcn.RTLD_LOCAL();
         }
 
-        static int getRTLD_LAZY(@SuppressWarnings("unused") Target_com_oracle_truffle_nfi_backend_libffi_LibFFIContextPosix ctx) {
+        static int getRTLD_LAZY(@SuppressWarnings("unused") Target_com_oracle_truffle_nfi_backend_libffi_LibFFIContext_Posix ctx) {
             return Dlfcn.RTLD_LAZY();
         }
 
-        static int getRTLD_NOW(@SuppressWarnings("unused") Target_com_oracle_truffle_nfi_backend_libffi_LibFFIContextPosix ctx) {
+        static int getRTLD_NOW(@SuppressWarnings("unused") Target_com_oracle_truffle_nfi_backend_libffi_LibFFIContext_Posix ctx) {
             return Dlfcn.RTLD_NOW();
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -34,15 +34,15 @@`
`34`	`34`
`35`	`35`	`@Platforms(Platform.LINUX.class)`
`36`	`36`	`@TargetClass(className = "com.oracle.truffle.nfi.backend.libffi.LibFFIContext", onlyWith = TruffleNFIFeature.IsEnabled.class)`
`37`		`-final class Target_com_oracle_truffle_nfi_backend_libffi_LibFFIContextLinux {`
	`37`	`+final class Target_com_oracle_truffle_nfi_backend_libffi_LibFFIContext_Linux {`
`38`	`38`
`39`	`39`	`// Checkstyle: stop`
`40`	`40`	`@Alias volatile long isolatedNamespaceId;`
`41`	`41`
`42`	`42`	`@Alias @InjectAccessors(IsolatedAccessor.class) int ISOLATED_NAMESPACE;`
`43`	`43`
`44`	`44`	`static class IsolatedAccessor {`
`45`		`- static int getISOLATED_NAMESPACE(@SuppressWarnings("unused") Target_com_oracle_truffle_nfi_backend_libffi_LibFFIContextLinux ctx) {`
	`45`	`+ static int getISOLATED_NAMESPACE(@SuppressWarnings("unused") Target_com_oracle_truffle_nfi_backend_libffi_LibFFIContext_Linux ctx) {`
`46`	`46`	`return PosixTruffleNFISupport.isolatedNamespaceFlag;`
`47`	`47`	`}`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,24 +35,24 @@`
`35`	`35`
`36`	`36`	`@TargetClass(className = "com.oracle.truffle.nfi.backend.libffi.LibFFIContext", onlyWith = TruffleNFIFeature.IsEnabled.class)`
`37`	`37`	`@Platforms({Platform.LINUX.class, Platform.DARWIN.class})`
`38`		`-final class Target_com_oracle_truffle_nfi_backend_libffi_LibFFIContextPosix {`
	`38`	`+final class Target_com_oracle_truffle_nfi_backend_libffi_LibFFIContext_Posix {`
`39`	`39`
`40`	`40`	`// Checkstyle: stop`
`41`	`41`	`static class RTLDAccessor {`
`42`	`42`
`43`		`- static int getRTLD_GLOBAL(@SuppressWarnings("unused") Target_com_oracle_truffle_nfi_backend_libffi_LibFFIContextPosix ctx) {`
	`43`	`+ static int getRTLD_GLOBAL(@SuppressWarnings("unused") Target_com_oracle_truffle_nfi_backend_libffi_LibFFIContext_Posix ctx) {`
`44`	`44`	`return Dlfcn.RTLD_GLOBAL();`
`45`	`45`	`}`
`46`	`46`
`47`		`- static int getRTLD_LOCAL(@SuppressWarnings("unused") Target_com_oracle_truffle_nfi_backend_libffi_LibFFIContextPosix ctx) {`
	`47`	`+ static int getRTLD_LOCAL(@SuppressWarnings("unused") Target_com_oracle_truffle_nfi_backend_libffi_LibFFIContext_Posix ctx) {`
`48`	`48`	`return Dlfcn.RTLD_LOCAL();`
`49`	`49`	`}`
`50`	`50`
`51`		`- static int getRTLD_LAZY(@SuppressWarnings("unused") Target_com_oracle_truffle_nfi_backend_libffi_LibFFIContextPosix ctx) {`
	`51`	`+ static int getRTLD_LAZY(@SuppressWarnings("unused") Target_com_oracle_truffle_nfi_backend_libffi_LibFFIContext_Posix ctx) {`
`52`	`52`	`return Dlfcn.RTLD_LAZY();`
`53`	`53`	`}`
`54`	`54`
`55`		`- static int getRTLD_NOW(@SuppressWarnings("unused") Target_com_oracle_truffle_nfi_backend_libffi_LibFFIContextPosix ctx) {`
	`55`	`+ static int getRTLD_NOW(@SuppressWarnings("unused") Target_com_oracle_truffle_nfi_backend_libffi_LibFFIContext_Posix ctx) {`
`56`	`56`	`return Dlfcn.RTLD_NOW();`
`57`	`57`	`}`
`58`	`58`	`}`