Skip to content

Commit 9776a2e

Browse files
committed
svm: FileSystemProviderBuildTimeInitSupport add _BuildTime suffix to substitutions
1 parent 07812b8 commit 9776a2e

File tree

1 file changed

+29
-29
lines changed

1 file changed

+29
-29
lines changed

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/buildtimeinit/FileSystemProviderBuildTimeInitSupport.java

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ public void afterRegistration(AfterRegistrationAccess access) {
156156
}
157157

158158
@TargetClass(value = java.nio.file.spi.FileSystemProvider.class, onlyWith = JDKInitializedAtBuildTime.class)
159-
final class Target_java_nio_file_spi_FileSystemProvider {
159+
final class Target_java_nio_file_spi_FileSystemProvider_BuildTime {
160160
@Substitute
161161
public static List<FileSystemProvider> installedProviders() {
162162
return ImageSingletons.lookup(FileSystemProviderBuildTimeInitSupport.class).installedProvidersImmutable;
@@ -187,10 +187,10 @@ public static List<FileSystemProvider> installedProviders() {
187187
*/
188188
@TargetClass(className = "sun.nio.fs.UnixFileSystem", onlyWith = JDKInitializedAtBuildTime.class)
189189
@Platforms({Platform.LINUX.class, Platform.DARWIN.class})
190-
final class Target_sun_nio_fs_UnixFileSystem {
190+
final class Target_sun_nio_fs_UnixFileSystem_BuildTime {
191191

192192
@Alias //
193-
Target_sun_nio_fs_UnixFileSystemProvider provider;
193+
Target_sun_nio_fs_UnixFileSystemProvider_BuildTime provider;
194194

195195
/*
196196
* All fields of UnixFileSystem that contain state. At this point, the subclasses
@@ -207,7 +207,7 @@ final class Target_sun_nio_fs_UnixFileSystem {
207207
private boolean needToResolveAgainstDefaultDirectory;
208208
@Alias //
209209
@InjectAccessors(UnixFileSystemAccessors.class) //
210-
private Target_sun_nio_fs_UnixPath rootDirectory;
210+
private Target_sun_nio_fs_UnixPath_BuildTime rootDirectory;
211211

212212
/**
213213
* Flag to check if reinitialization at run time is needed. For objects in the image heap, this
@@ -231,21 +231,21 @@ final class Target_sun_nio_fs_UnixFileSystem {
231231
boolean injectedNeedToResolveAgainstDefaultDirectory;
232232
@Inject //
233233
@RecomputeFieldValue(kind = Kind.Reset)//
234-
Target_sun_nio_fs_UnixPath injectedRootDirectory;
234+
Target_sun_nio_fs_UnixPath_BuildTime injectedRootDirectory;
235235

236236
@Alias
237237
@TargetElement(name = TargetElement.CONSTRUCTOR_NAME)
238-
native void originalConstructor(Target_sun_nio_fs_UnixFileSystemProvider p, String dir);
238+
native void originalConstructor(Target_sun_nio_fs_UnixFileSystemProvider_BuildTime p, String dir);
239239
}
240240

241241
@TargetClass(className = "sun.nio.fs.UnixFileSystemProvider", onlyWith = JDKInitializedAtBuildTime.class)
242242
@Platforms({Platform.LINUX.class, Platform.DARWIN.class})
243-
final class Target_sun_nio_fs_UnixFileSystemProvider {
243+
final class Target_sun_nio_fs_UnixFileSystemProvider_BuildTime {
244244
}
245245

246246
@TargetClass(className = "sun.nio.fs.UnixPath", onlyWith = JDKInitializedAtBuildTime.class)
247247
@Platforms({Platform.LINUX.class, Platform.DARWIN.class})
248-
final class Target_sun_nio_fs_UnixPath {
248+
final class Target_sun_nio_fs_UnixPath_BuildTime {
249249
}
250250

251251
class NeedsReinitializationProvider implements FieldValueTransformer {
@@ -271,21 +271,21 @@ class UnixFileSystemAccessors {
271271
* first access of any of the fields.
272272
*/
273273

274-
static byte[] getDefaultDirectory(Target_sun_nio_fs_UnixFileSystem that) {
274+
static byte[] getDefaultDirectory(Target_sun_nio_fs_UnixFileSystem_BuildTime that) {
275275
if (that.needsReinitialization != NeedsReinitializationProvider.STATUS_REINITIALIZED) {
276276
reinitialize(that);
277277
}
278278
return that.injectedDefaultDirectory;
279279
}
280280

281-
static boolean getNeedToResolveAgainstDefaultDirectory(Target_sun_nio_fs_UnixFileSystem that) {
281+
static boolean getNeedToResolveAgainstDefaultDirectory(Target_sun_nio_fs_UnixFileSystem_BuildTime that) {
282282
if (that.needsReinitialization != NeedsReinitializationProvider.STATUS_REINITIALIZED) {
283283
reinitialize(that);
284284
}
285285
return that.injectedNeedToResolveAgainstDefaultDirectory;
286286
}
287287

288-
static Target_sun_nio_fs_UnixPath getRootDirectory(Target_sun_nio_fs_UnixFileSystem that) {
288+
static Target_sun_nio_fs_UnixPath_BuildTime getRootDirectory(Target_sun_nio_fs_UnixFileSystem_BuildTime that) {
289289
if (that.needsReinitialization != NeedsReinitializationProvider.STATUS_REINITIALIZED) {
290290
reinitialize(that);
291291
}
@@ -298,23 +298,23 @@ static Target_sun_nio_fs_UnixPath getRootDirectory(Target_sun_nio_fs_UnixFileSys
298298
* of the constructor to write to the injected fields directly.
299299
*/
300300

301-
static void setDefaultDirectory(Target_sun_nio_fs_UnixFileSystem that, byte[] value) {
301+
static void setDefaultDirectory(Target_sun_nio_fs_UnixFileSystem_BuildTime that, byte[] value) {
302302
that.injectedDefaultDirectory = value;
303303
}
304304

305-
static void setNeedToResolveAgainstDefaultDirectory(Target_sun_nio_fs_UnixFileSystem that, boolean value) {
305+
static void setNeedToResolveAgainstDefaultDirectory(Target_sun_nio_fs_UnixFileSystem_BuildTime that, boolean value) {
306306
that.injectedNeedToResolveAgainstDefaultDirectory = value;
307307
}
308308

309-
static void setRootDirectory(Target_sun_nio_fs_UnixFileSystem that, Target_sun_nio_fs_UnixPath value) {
309+
static void setRootDirectory(Target_sun_nio_fs_UnixFileSystem_BuildTime that, Target_sun_nio_fs_UnixPath_BuildTime value) {
310310
that.injectedRootDirectory = value;
311311
}
312312

313313
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+20/src/java.base/linux/classes/sun/nio/fs/LinuxFileSystem.java#L44-L46")
314314
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+20/src/java.base/linux/classes/sun/nio/fs/LinuxFileSystemProvider.java#L45-L47")
315315
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+20/src/java.base/unix/classes/sun/nio/fs/UnixFileSystemProvider.java#L75-L77")
316316
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+20/src/java.base/unix/classes/sun/nio/fs/UnixFileSystem.java#L78-L108")
317-
private static synchronized void reinitialize(Target_sun_nio_fs_UnixFileSystem that) {
317+
private static synchronized void reinitialize(Target_sun_nio_fs_UnixFileSystem_BuildTime that) {
318318
if (that.needsReinitialization != NeedsReinitializationProvider.STATUS_NEEDS_REINITIALIZATION) {
319319
/* Field initialized is volatile, so double-checked locking is OK. */
320320
return;
@@ -350,10 +350,10 @@ private static synchronized void reinitialize(Target_sun_nio_fs_UnixFileSystem t
350350

351351
@TargetClass(className = "sun.nio.fs.WindowsFileSystem")
352352
@Platforms({Platform.WINDOWS.class})
353-
final class Target_sun_nio_fs_WindowsFileSystem {
353+
final class Target_sun_nio_fs_WindowsFileSystem_BuildTime {
354354

355355
@Alias //
356-
Target_sun_nio_fs_WindowsFileSystemProvider provider;
356+
Target_sun_nio_fs_WindowsFileSystemProvider_BuildTime provider;
357357

358358
@Alias //
359359
@InjectAccessors(WindowsFileSystemAccessors.class) //
@@ -375,39 +375,39 @@ final class Target_sun_nio_fs_WindowsFileSystem {
375375

376376
@Alias
377377
@TargetElement(name = TargetElement.CONSTRUCTOR_NAME)
378-
native void originalConstructor(Target_sun_nio_fs_WindowsFileSystemProvider p, String dir);
378+
native void originalConstructor(Target_sun_nio_fs_WindowsFileSystemProvider_BuildTime p, String dir);
379379
}
380380

381381
@TargetClass(className = "sun.nio.fs.WindowsFileSystemProvider")
382382
@Platforms({Platform.WINDOWS.class})
383-
final class Target_sun_nio_fs_WindowsFileSystemProvider {
383+
final class Target_sun_nio_fs_WindowsFileSystemProvider_BuildTime {
384384
}
385385

386386
@Platforms({Platform.WINDOWS.class})
387387
class WindowsFileSystemAccessors {
388-
static String getDefaultDirectory(Target_sun_nio_fs_WindowsFileSystem that) {
388+
static String getDefaultDirectory(Target_sun_nio_fs_WindowsFileSystem_BuildTime that) {
389389
if (that.needsReinitialization != NeedsReinitializationProvider.STATUS_REINITIALIZED) {
390390
reinitialize(that);
391391
}
392392
return that.injectedDefaultDirectory;
393393
}
394394

395-
static String getDefaultRoot(Target_sun_nio_fs_WindowsFileSystem that) {
395+
static String getDefaultRoot(Target_sun_nio_fs_WindowsFileSystem_BuildTime that) {
396396
if (that.needsReinitialization != NeedsReinitializationProvider.STATUS_REINITIALIZED) {
397397
reinitialize(that);
398398
}
399399
return that.injectedDefaultRoot;
400400
}
401401

402-
static void setDefaultDirectory(Target_sun_nio_fs_WindowsFileSystem that, String value) {
402+
static void setDefaultDirectory(Target_sun_nio_fs_WindowsFileSystem_BuildTime that, String value) {
403403
that.injectedDefaultDirectory = value;
404404
}
405405

406-
static void setDefaultRoot(Target_sun_nio_fs_WindowsFileSystem that, String value) {
406+
static void setDefaultRoot(Target_sun_nio_fs_WindowsFileSystem_BuildTime that, String value) {
407407
that.injectedDefaultRoot = value;
408408
}
409409

410-
private static synchronized void reinitialize(Target_sun_nio_fs_WindowsFileSystem that) {
410+
private static synchronized void reinitialize(Target_sun_nio_fs_WindowsFileSystem_BuildTime that) {
411411
if (that.needsReinitialization != NeedsReinitializationProvider.STATUS_NEEDS_REINITIALIZATION) {
412412
return;
413413
}
@@ -419,23 +419,23 @@ private static synchronized void reinitialize(Target_sun_nio_fs_WindowsFileSyste
419419

420420
@TargetClass(className = "java.io.UnixFileSystem", onlyWith = JDKInitializedAtBuildTime.class)
421421
@Platforms({Platform.LINUX.class, Platform.DARWIN.class})
422-
final class Target_java_io_UnixFileSystem {
422+
final class Target_java_io_UnixFileSystem_BuildTime {
423423

424424
@Alias //
425425
@InjectAccessors(UserDirAccessors.class) //
426426
private String userDir;
427427
}
428428

429429
@TargetClass(className = "java.io.FileSystem", onlyWith = JDKInitializedAtBuildTime.class)
430-
final class Target_java_io_FileSystem {
430+
final class Target_java_io_FileSystem_BuildTime {
431431

432432
@Alias
433433
native String normalize(String path);
434434
}
435435

436436
class UserDirAccessors {
437437
@SuppressWarnings("unused")
438-
static String getUserDir(Target_java_io_FileSystem that) {
438+
static String getUserDir(Target_java_io_FileSystem_BuildTime that) {
439439
if (Platform.includedIn(Platform.WINDOWS.class)) {
440440
/*
441441
* Note that on Windows, we normalize the property value (JDK-8198997) and do not use
@@ -447,14 +447,14 @@ static String getUserDir(Target_java_io_FileSystem that) {
447447
}
448448

449449
@SuppressWarnings("unused")
450-
static void setUserDir(Target_java_io_FileSystem that, String value) {
450+
static void setUserDir(Target_java_io_FileSystem_BuildTime that, String value) {
451451
throw VMError.shouldNotReachHere("Field userDir is initialized at build time");
452452
}
453453
}
454454

455455
@TargetClass(className = "java.io.WinNTFileSystem")
456456
@Platforms(Platform.WINDOWS.class)
457-
final class Target_java_io_WinNTFileSystem {
457+
final class Target_java_io_WinNTFileSystem_BuildTime {
458458

459459
@Alias //
460460
@InjectAccessors(UserDirAccessors.class) //

0 commit comments

Comments
 (0)