[GR-68638] Minor code cleanups.

christianhaeubl · christianhaeubl · commit d75731021a85 · 2025-08-13T01:44:13.000Z
PullRequest: graal/21821
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java
@@ -1411,7 +1411,6 @@ protected NativeLibraries setupNativeLibraries(HostedProviders providers, CEnumC
         }
     }
 
-    @SuppressWarnings("deprecation")
     protected void registerEntryPoints(Map<Method, CEntryPointData> entryPoints) {
         for (Method m : loader.findAnnotatedMethods(CEntryPoint.class)) {
             if (!Modifier.isStatic(m.getModifiers())) {
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/CAnnotationProcessor.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/CAnnotationProcessor.java
@@ -87,7 +87,7 @@ public CAnnotationProcessor(NativeLibraries nativeLibs, NativeCodeContext codeCt
     public NativeCodeInfo process(CAnnotationProcessorCache cache) {
         InfoTreeBuilder constructor = new InfoTreeBuilder(nativeLibs, codeCtx);
         codeInfo = constructor.construct();
-        if (nativeLibs.getErrors().size() > 0) {
+        if (!nativeLibs.getErrors().isEmpty()) {
             return codeInfo;
         }
 
@@ -99,7 +99,7 @@ public NativeCodeInfo process(CAnnotationProcessorCache cache) {
              */
             writer = new QueryCodeWriter(queryCodeDirectory);
             Path queryFile = writer.write(codeInfo);
-            if (nativeLibs.getErrors().size() > 0) {
+            if (!nativeLibs.getErrors().isEmpty()) {
                 return codeInfo;
             }
             assert Files.exists(queryFile);
@@ -110,12 +110,12 @@ public NativeCodeInfo process(CAnnotationProcessorCache cache) {
             }
             Path binary = compileQueryCode(queryFile);
             DeadlockWatchdog.singleton().recordActivity();
-            if (nativeLibs.getErrors().size() > 0) {
+            if (!nativeLibs.getErrors().isEmpty()) {
                 return codeInfo;
             }
 
             makeQuery(cache, binary.toString());
-            if (nativeLibs.getErrors().size() > 0) {
+            if (!nativeLibs.getErrors().isEmpty()) {
                 return codeInfo;
             }
         }
@@ -159,8 +159,7 @@ private Path compileQueryCode(Path queryFile) {
         }
         String fileName = fileNamePath.toString();
         Path binary = tempDirectory.resolve(compilerInvoker.asExecutableName(fileName.substring(0, fileName.lastIndexOf("."))));
-        ArrayList<String> options = new ArrayList<>();
-        options.addAll(codeCtx.getDirectives().getOptions());
+        ArrayList<String> options = new ArrayList<>(codeCtx.getDirectives().getOptions());
         if (Platform.includedIn(Platform.LINUX.class)) {
             options.addAll(HostedLibCBase.singleton().getAdditionalQueryCodeCompilerOptions());
         }
@@ -187,7 +186,7 @@ protected void reportCompilerError(ProcessBuilder current, Path queryFile, Strin
                         elements.add(writer.getElementForLineNumber(lineNumber));
                         elements.add("C file contents around line " + lineNumber + ":");
                         for (int i = Math.max(lineNumber - 1, 1); i <= lineNumber + 1; i++) {
-                            elements.add(queryFile.toString() + ":" + i + ": " + writer.getLine(i));
+                            elements.add(queryFile + ":" + i + ": " + writer.getLine(i));
                         }
                     } catch (NumberFormatException ex) {
                         /* Ignore if not a valid number. */
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/CAnnotationProcessorCache.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/CAnnotationProcessorCache.java
@@ -77,16 +77,13 @@ public static class Options {
             @Override
             public Boolean getValueOrDefault(UnmodifiableEconomicMap<OptionKey<?>, Object> values) {
                 if (!values.containsKey(this)) {
-                    // If user hasn't specified this option, we should determine optimal default
-                    // value.
-                    if (!ExitAfterQueryCodeGeneration.getValue() && !ImageSingletons.lookup(Platform.class).getArchitecture().equals(SubstrateUtil.getArchitectureName())) {
-                        // If query code generation isn't explicitly requested, and we are running
-                        // cross-arch build, CAP cache should be required (since we cannot run query
-                        // code).
-                        return true;
-                    } else {
-                        return false;
-                    }
+                    /*
+                     * If the user hasn't specified this option, we should determine an optimal
+                     * value automatically. If query code generation isn't explicitly requested, and
+                     * we are running cross-arch build, CAP cache is required (since we cannot run
+                     * any query code).
+                     */
+                    return !ExitAfterQueryCodeGeneration.getValue() && !ImageSingletons.lookup(Platform.class).getArchitecture().equals(SubstrateUtil.getArchitectureName());
                 }
                 return (Boolean) values.get(this);
             }
@@ -118,7 +115,6 @@ public Boolean getValue(OptionValues values) {
     }
 
     private File cache;
-    private File query;
 
     public CAnnotationProcessorCache() {
         if ((Options.UseCAPCache.getValue() || Options.NewCAPCache.getValue())) {
@@ -145,7 +141,7 @@ public CAnnotationProcessorCache() {
 
         if (Options.QueryCodeDir.hasBeenSet()) {
             Path queryPath = FileSystems.getDefault().getPath(Options.QueryCodeDir.getValue()).toAbsolutePath();
-            query = queryPath.toFile();
+            File query = queryPath.toFile();
             if (!query.exists()) {
                 try {
                     query = Files.createDirectories(queryPath).toFile();
@@ -188,16 +184,15 @@ public void put(NativeCodeInfo nativeCodeInfo, List<String> lines) {
                 writer.write(line);
                 writer.write(Character.LINE_SEPARATOR);
             }
-            return;
         } catch (IOException e) {
-            throw shouldNotReachHere("Invalid CAnnotation Processor Cache item:" + cachedItem.toString());
+            throw shouldNotReachHere("Invalid CAnnotation Processor Cache item:" + cachedItem);
         }
     }
 
     private void clearCache() {
         try {
             final Path cachePath = cache.toPath();
-            Files.walkFileTree(cachePath, new SimpleFileVisitor<Path>() {
+            Files.walkFileTree(cachePath, new SimpleFileVisitor<>() {
                 @Override
                 public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
                     assert file.toString().endsWith(FILE_EXTENSION);
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/CGlobalDataFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/CGlobalDataFeature.java
@@ -198,7 +198,7 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
                     AbstractMergeNode merge = b.append(new MergeNode());
                     merge.addForwardEnd(thenEnd);
                     merge.addForwardEnd(elseEnd);
-                    ValuePhiNode phiNode = new ValuePhiNode(StampFactory.pointer(), merge, new ValueNode[]{address, readValue});
+                    ValuePhiNode phiNode = new ValuePhiNode(StampFactory.pointer(), merge, address, readValue);
                     phiNode.inferStamp();
                     b.push(targetMethod.getSignature().getReturnKind(), b.getGraph().addOrUnique(phiNode));
                     b.setStateAfter(merge);
@@ -296,7 +296,8 @@ private void layout() {
                             info.assignOffset(currentOffset);
 
                             int nextOffset = currentOffset + info.getSize();
-                            return (nextOffset + (wordSize - 1)) & ~(wordSize - 1); // align
+                            int alignmentMask = -wordSize;
+                            return (nextOffset + (wordSize - 1)) & alignmentMask;
                         }, Integer::sum);
         assert isLaidOut();
     }
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/CIsolateDataFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/CIsolateDataFeature.java
@@ -28,16 +28,17 @@
 import java.util.Comparator;
 import java.util.Map;
 
-import com.oracle.svm.core.c.CIsolateDataStorage;
+import org.graalvm.word.UnsignedWord;
+
 import com.oracle.svm.core.c.CIsolateData;
+import com.oracle.svm.core.c.CIsolateDataStorage;
 import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
 import com.oracle.svm.core.feature.InternalFeature;
 import com.oracle.svm.core.util.ConcurrentIdentityHashMap;
 import com.oracle.svm.core.util.UnsignedUtils;
 import com.oracle.svm.core.util.VMError;
 
 import jdk.graal.compiler.word.Word;
-import org.graalvm.word.UnsignedWord;
 
 @AutomaticallyRegisteredFeature
 public class CIsolateDataFeature implements InternalFeature {
@@ -50,8 +51,7 @@ public void duringSetup(DuringSetupAccess access) {
     }
 
     private Object replaceObject(Object obj) {
-        if (obj instanceof CIsolateData<?>) {
-            CIsolateData<?> entry = (CIsolateData<?>) obj;
+        if (obj instanceof CIsolateData<?> entry) {
             usedEntries.compute(entry.getName(), (key, old) -> {
                 VMError.guarantee(old == null || old == entry, "The isolate data section already contains an entry for %s", key);
                 return entry;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/NativeLibraries.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/NativeLibraries.java
@@ -397,7 +397,7 @@ public List<CInterfaceError> getErrors() {
     }
 
     public void reportErrors() {
-        if (errors.size() > 0) {
+        if (!errors.isEmpty()) {
             throw UserError.abort(errors.stream().map(CInterfaceError::getMessage).collect(Collectors.toList()));
         }
     }
@@ -576,7 +576,7 @@ private Class<? extends CContext.Directives> getDirectives(ResolvedJavaType type
     }
 
     public void finish() {
-        libraryPaths.addAll(SubstrateOptions.CLibraryPath.getValue().values().stream().map(Path::toString).collect(Collectors.toList()));
+        libraryPaths.addAll(SubstrateOptions.CLibraryPath.getValue().values().stream().map(Path::toString).toList());
         for (NativeCodeContext context : compilationUnitToContext.values()) {
             if (context.isInConfiguration()) {
                 libraries.addAll(context.getDirectives().getLibraries());
@@ -642,9 +642,9 @@ public ConstantReflectionProvider getConstantReflection() {
         return constantReflection;
     }
 
-    public boolean processAnnotated() {
+    public void processAnnotated() {
         if (annotated.isEmpty()) {
-            return false;
+            return;
         }
         for (CLibrary lib : annotated) {
             if (lib.requireStatic()) {
@@ -654,7 +654,6 @@ public boolean processAnnotated() {
             }
         }
         annotated.clear();
-        return true;
     }
 
     public List<String> getJniStaticLibraries() {
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/OffsetOfSupportImpl.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/OffsetOfSupportImpl.java
@@ -49,8 +49,7 @@ public int offsetOf(Class<? extends PointerBase> clazz, String fieldName) {
         VMError.guarantee(typeInfo instanceof StructInfo, "Class parameter %s of call to %s is not an annotated C struct", type, SizeOf.class.getSimpleName());
         StructInfo structInfo = (StructInfo) typeInfo;
         for (ElementInfo element : structInfo.getChildren()) {
-            if (element instanceof StructFieldInfo) {
-                StructFieldInfo field = (StructFieldInfo) element;
+            if (element instanceof StructFieldInfo field) {
                 if (field.getName().equals(fieldName)) {
                     return field.getOffsetInfo().getProperty();
                 }
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/codegen/CSourceCodeWriter.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/codegen/CSourceCodeWriter.java
@@ -63,20 +63,15 @@
 import jdk.vm.ci.meta.ResolvedJavaType;
 
 public class CSourceCodeWriter {
-
     private static final String INDENT4 = "    ";
-    public static final String C_SOURCE_FILE_EXTENSION = ".c";
-
-    private final List<String> lines;
-    private final StringBuilder currentLine;
 
+    private final List<String> lines = new ArrayList<>();
+    private final StringBuilder currentLine = new StringBuilder(100);
+    private final Path tempDirectory;
     private int indentLevel = 0;
-    protected final Path tempDirectory;
 
     public CSourceCodeWriter(Path tempDirectory) {
         this.tempDirectory = tempDirectory;
-        this.lines = new ArrayList<>();
-        this.currentLine = new StringBuilder(100);
     }
 
     public void writeCStandardHeaders() {
@@ -262,8 +257,7 @@ private static boolean isUnsigned(AnnotatedType type) {
 
     private static boolean isFunctionPointer(MetaAccessProvider metaAccess, ResolvedJavaType type) {
         boolean functionPointer = metaAccess.lookupJavaType(CFunctionPointer.class).isAssignableFrom(type);
-        return functionPointer &&
-                        Arrays.stream(type.getDeclaredMethods(false)).anyMatch(v -> v.getDeclaredAnnotation(InvokeCFunctionPointer.class) != null);
+        return functionPointer && Arrays.stream(type.getDeclaredMethods(false)).anyMatch(v -> v.getDeclaredAnnotation(InvokeCFunctionPointer.class) != null);
     }
 
     /**
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/codegen/QueryCodeWriter.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/codegen/QueryCodeWriter.java
@@ -54,7 +54,7 @@
 import com.oracle.svm.hosted.c.query.QueryResultFormat;
 
 public class QueryCodeWriter extends InfoTreeVisitor {
-
+    private static final String C_SOURCE_FILE_EXTENSION = ".c";
     private static final String formatFloat = "%.15e";
     private static final String formatString = QueryResultFormat.STRING_MARKER + "%s" + QueryResultFormat.STRING_MARKER;
 
@@ -91,8 +91,7 @@ private static String int64(boolean isWindows, boolean unsigned) {
     public Path write(NativeCodeInfo nativeCodeInfo) {
         nativeCodeInfo.accept(this);
 
-        String srcFileExtension = CSourceCodeWriter.C_SOURCE_FILE_EXTENSION;
-        String sourceFileName = nativeCodeInfo.getName().replaceAll("\\W", "_") + srcFileExtension;
+        String sourceFileName = nativeCodeInfo.getName().replaceAll("\\W", "_") + C_SOURCE_FILE_EXTENSION;
         return writer.writeFile(sourceFileName);
     }
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/function/CEntryPointSupport.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/function/CEntryPointSupport.java
@@ -77,7 +77,7 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
             @Override
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode isolate, ValueNode ensureJavaThreadNode) {
                 if (!ensureJavaThreadNode.isConstant()) {
-                    b.bailout("Parameter ensureJavaThread of enterAttachThread must be a compile time constant");
+                    throw b.bailout("Parameter ensureJavaThread of enterAttachThread must be a compile time constant");
                 }
                 b.addPush(JavaKind.Int, CEntryPointEnterNode.attachThread(isolate, false, ensureJavaThreadNode.asJavaConstant().asInt() != 0));
                 return true;
@@ -87,7 +87,7 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
             @Override
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode isolate, ValueNode startedByIsolate, ValueNode ensureJavaThread) {
                 if (!startedByIsolate.isConstant() || !ensureJavaThread.isConstant()) {
-                    b.bailout("Parameters ensureJavaThread and startedByIsolate of enterAttachThread must be a compile time constant");
+                    throw b.bailout("Parameters ensureJavaThread and startedByIsolate of enterAttachThread must be a compile time constant");
                 }
                 b.addPush(JavaKind.Int, CEntryPointEnterNode.attachThread(isolate, startedByIsolate.asJavaConstant().asInt() != 0, ensureJavaThread.asJavaConstant().asInt() != 0));
                 return true;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/info/InfoTreeBuilder.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/info/InfoTreeBuilder.java
@@ -531,7 +531,7 @@ private boolean validInterfaceDefinition(ResolvedJavaType type, Class<? extends
     }
 
     private static String removePrefix(String name, String prefix) {
-        assert prefix.length() > 0;
+        assert !prefix.isEmpty();
         String result = name;
         if (result.startsWith(prefix)) {
             result = result.substring(prefix.length());
@@ -545,7 +545,7 @@ private static String removePrefix(String name, String prefix) {
     private static String getConstantName(ResolvedJavaMethod method) {
         CConstant constantAnnotation = getMethodAnnotation(method, CConstant.class);
         String name = constantAnnotation.value();
-        if (name.length() == 0) {
+        if (name.isEmpty()) {
             name = method.getName();
             /* Remove "get" prefix for automatically inferred names. */
             name = removePrefix(name, "get");
@@ -569,7 +569,7 @@ private String getCPointerToTypeName(ResolvedJavaType type) {
             pointerToType = pointerToType.getInterfaces().length == 1 ? pointerToType.getInterfaces()[0] : null;
         } while (pointerToType != null);
 
-        int n = (nameOfCType.length() > 0 ? 1 : 0) + (pointerToCStructAnnotation != null ? 1 : 0) + (pointerToCPointerAnnotation != null ? 1 : 0);
+        int n = (!nameOfCType.isEmpty() ? 1 : 0) + (pointerToCStructAnnotation != null ? 1 : 0) + (pointerToCPointerAnnotation != null ? 1 : 0);
         if (n != 1) {
             nativeLibs.addError("Exactly one of " +  //
                             "1) literal C type name, " +  //
@@ -629,7 +629,7 @@ private static String getStructName(ResolvedJavaType type) {
 
         String name = structAnnotation.value();
 
-        if (name.length() == 0) {
+        if (name.isEmpty()) {
             name = getSimpleJavaName(type);
         }
         if (structAnnotation.addStructKeyword()) {
@@ -650,7 +650,7 @@ private static String getSimpleJavaName(ResolvedJavaType type) {
     }
 
     private static String getStructFieldName(AccessorInfo info, String annotationValue) {
-        if (annotationValue.length() != 0) {
+        if (!annotationValue.isEmpty()) {
             return annotationValue;
         } else {
             return removePrefix(info.getAnnotatedElement().getName(), info.getAccessorPrefix());
@@ -712,7 +712,7 @@ private void createEnumConstantInfo(EnumInfo enumInfo, ResolvedJavaField field)
             name = fieldAnnotation.value();
             includeInLookup = fieldAnnotation.includeInLookup();
         }
-        if (name.length() == 0) {
+        if (name.isEmpty()) {
             name = field.getName();
         }
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/info/InfoTreeVisitor.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/info/InfoTreeVisitor.java
@@ -49,7 +49,7 @@ public abstract class InfoTreeVisitor {
     static {
         /* Defining the comparator chain on multiple lines requires less type annotations. */
         Comparator<ElementInfo> classNameComparator = Comparator.comparing(e -> e.getClass().getName());
-        Comparator<ElementInfo> nameComparator = classNameComparator.thenComparing(e -> e.getName());
+        Comparator<ElementInfo> nameComparator = classNameComparator.thenComparing(ElementInfo::getName);
         elementInfoComparator = nameComparator.thenComparing(e -> asString(e.getAnnotatedElement()));
     }
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/info/StructFieldInfo.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/info/StructFieldInfo.java
@@ -39,7 +39,7 @@ public class StructFieldInfo extends SizableInfo {
     @SuppressWarnings("this-escape")
     public StructFieldInfo(String name, ElementKind kind) {
         super(name, kind);
-        this.offset = adoptChild(new PropertyInfo<Integer>("offset"));
+        this.offset = adoptChild(new PropertyInfo<>("offset"));
     }
 
     public PropertyInfo<Integer> getOffsetInfo() {
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/info/StructInfo.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/info/StructInfo.java
@@ -34,7 +34,7 @@ public class StructInfo extends SizableInfo {
     private final ResolvedJavaType annotatedType;
 
     private final boolean isIncomplete;
-    private String typedefName;
+    private final String typedefName;
 
     public static StructInfo create(String typeName, ResolvedJavaType annotatedType) {
         String typedefAnnotation = InfoTreeBuilder.getTypedefName(annotatedType);
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImage.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImage.java

Original file line number	Diff line number	Diff line change
`@@ -1411,7 +1411,6 @@ protected NativeLibraries setupNativeLibraries(HostedProviders providers, CEnumC`
`1411`	`1411`	`}`
`1412`	`1412`	`}`
`1413`	`1413`
`1414`		`- @SuppressWarnings("deprecation")`
`1415`	`1414`	`protected void registerEntryPoints(Map<Method, CEntryPointData> entryPoints) {`
`1416`	`1415`	`for (Method m : loader.findAnnotatedMethods(CEntryPoint.class)) {`
`1417`	`1416`	`if (!Modifier.isStatic(m.getModifiers())) {`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public CAnnotationProcessor(NativeLibraries nativeLibs, NativeCodeContext codeCt`
`87`	`87`	`public NativeCodeInfo process(CAnnotationProcessorCache cache) {`
`88`	`88`	`InfoTreeBuilder constructor = new InfoTreeBuilder(nativeLibs, codeCtx);`
`89`	`89`	`codeInfo = constructor.construct();`
`90`		`- if (nativeLibs.getErrors().size() > 0) {`
	`90`	`+ if (!nativeLibs.getErrors().isEmpty()) {`
`91`	`91`	`return codeInfo;`
`92`	`92`	`}`
`93`	`93`
`@@ -99,7 +99,7 @@ public NativeCodeInfo process(CAnnotationProcessorCache cache) {`
`99`	`99`	`*/`
`100`	`100`	`writer = new QueryCodeWriter(queryCodeDirectory);`
`101`	`101`	`Path queryFile = writer.write(codeInfo);`
`102`		`- if (nativeLibs.getErrors().size() > 0) {`
	`102`	`+ if (!nativeLibs.getErrors().isEmpty()) {`
`103`	`103`	`return codeInfo;`
`104`	`104`	`}`
`105`	`105`	`assert Files.exists(queryFile);`
`@@ -110,12 +110,12 @@ public NativeCodeInfo process(CAnnotationProcessorCache cache) {`
`110`	`110`	`}`
`111`	`111`	`Path binary = compileQueryCode(queryFile);`
`112`	`112`	`DeadlockWatchdog.singleton().recordActivity();`
`113`		`- if (nativeLibs.getErrors().size() > 0) {`
	`113`	`+ if (!nativeLibs.getErrors().isEmpty()) {`
`114`	`114`	`return codeInfo;`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`makeQuery(cache, binary.toString());`
`118`		`- if (nativeLibs.getErrors().size() > 0) {`
	`118`	`+ if (!nativeLibs.getErrors().isEmpty()) {`
`119`	`119`	`return codeInfo;`
`120`	`120`	`}`
`121`	`121`	`}`
`@@ -159,8 +159,7 @@ private Path compileQueryCode(Path queryFile) {`
`159`	`159`	`}`
`160`	`160`	`String fileName = fileNamePath.toString();`
`161`	`161`	`Path binary = tempDirectory.resolve(compilerInvoker.asExecutableName(fileName.substring(0, fileName.lastIndexOf("."))));`
`162`		`- ArrayList<String> options = new ArrayList<>();`
`163`		`- options.addAll(codeCtx.getDirectives().getOptions());`
	`162`	`+ ArrayList<String> options = new ArrayList<>(codeCtx.getDirectives().getOptions());`
`164`	`163`	`if (Platform.includedIn(Platform.LINUX.class)) {`
`165`	`164`	`options.addAll(HostedLibCBase.singleton().getAdditionalQueryCodeCompilerOptions());`
`166`	`165`	`}`
`@@ -187,7 +186,7 @@ protected void reportCompilerError(ProcessBuilder current, Path queryFile, Strin`
`187`	`186`	`elements.add(writer.getElementForLineNumber(lineNumber));`
`188`	`187`	`elements.add("C file contents around line " + lineNumber + ":");`
`189`	`188`	`for (int i = Math.max(lineNumber - 1, 1); i <= lineNumber + 1; i++) {`
`190`		`- elements.add(queryFile.toString() + ":" + i + ": " + writer.getLine(i));`
	`189`	`+ elements.add(queryFile + ":" + i + ": " + writer.getLine(i));`
`191`	`190`	`}`
`192`	`191`	`} catch (NumberFormatException ex) {`
`193`	`192`	`/* Ignore if not a valid number. */`
Original file line number	Diff line number	Diff line change
`@@ -397,7 +397,7 @@ public List<CInterfaceError> getErrors() {`
`397`	`397`	`}`
`398`	`398`
`399`	`399`	`public void reportErrors() {`
`400`		`- if (errors.size() > 0) {`
	`400`	`+ if (!errors.isEmpty()) {`
`401`	`401`	`throw UserError.abort(errors.stream().map(CInterfaceError::getMessage).collect(Collectors.toList()));`
`402`	`402`	`}`
`403`	`403`	`}`
`@@ -576,7 +576,7 @@ private Class<? extends CContext.Directives> getDirectives(ResolvedJavaType type`
`576`	`576`	`}`
`577`	`577`
`578`	`578`	`public void finish() {`
`579`		`- libraryPaths.addAll(SubstrateOptions.CLibraryPath.getValue().values().stream().map(Path::toString).collect(Collectors.toList()));`
	`579`	`+ libraryPaths.addAll(SubstrateOptions.CLibraryPath.getValue().values().stream().map(Path::toString).toList());`
`580`	`580`	`for (NativeCodeContext context : compilationUnitToContext.values()) {`
`581`	`581`	`if (context.isInConfiguration()) {`
`582`	`582`	`libraries.addAll(context.getDirectives().getLibraries());`
`@@ -642,9 +642,9 @@ public ConstantReflectionProvider getConstantReflection() {`
`642`	`642`	`return constantReflection;`
`643`	`643`	`}`
`644`	`644`
`645`		`- public boolean processAnnotated() {`
	`645`	`+ public void processAnnotated() {`
`646`	`646`	`if (annotated.isEmpty()) {`
`647`		`- return false;`
	`647`	`+ return;`
`648`	`648`	`}`
`649`	`649`	`for (CLibrary lib : annotated) {`
`650`	`650`	`if (lib.requireStatic()) {`
`@@ -654,7 +654,6 @@ public boolean processAnnotated() {`
`654`	`654`	`}`
`655`	`655`	`}`
`656`	`656`	`annotated.clear();`
`657`		`- return true;`
`658`	`657`	`}`
`659`	`658`
`660`	`659`	`public List<String> getJniStaticLibraries() {`