Added option QueryIfNotInCAPCache.

Author: christianhaeubl

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/CAnnotationProcessor.java

@@ -34,7 +34,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import com.oracle.svm.hosted.DeadlockWatchdog;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 
@@ -43,6 +42,7 @@
 import com.oracle.svm.core.util.InterruptImageBuilding;
 import com.oracle.svm.core.util.UserError;
 import com.oracle.svm.core.util.VMError;
+import com.oracle.svm.hosted.DeadlockWatchdog;
 import com.oracle.svm.hosted.c.codegen.CCompilerInvoker;
 import com.oracle.svm.hosted.c.codegen.QueryCodeWriter;
 import com.oracle.svm.hosted.c.info.InfoTreeBuilder;
@@ -90,10 +90,9 @@ public NativeCodeInfo process(CAnnotationProcessorCache cache) {
         if (nativeLibs.getErrors().size() > 0) {
             return codeInfo;
         }
-        if (CAnnotationProcessorCache.Options.UseCAPCache.getValue()) {
-            /* If using a CAP cache, short cut the whole building/compile/execute query. */
-            cache.get(nativeLibs, codeInfo);
-        } else {
+
+        boolean cached = CAnnotationProcessorCache.Options.UseCAPCache.getValue() && cache.get(nativeLibs, codeInfo);
+        if (!cached) {
             /*
              * Generate C source file (the "Query") that will produce the information needed (e.g.,
              * size of struct/union and offsets to their fields, value of enum/macros etc.).
@@ -120,8 +119,8 @@ public NativeCodeInfo process(CAnnotationProcessorCache cache) {
                 return codeInfo;
             }
         }
-        RawStructureLayoutPlanner.plan(nativeLibs, codeInfo);
 
+        RawStructureLayoutPlanner.plan(nativeLibs, codeInfo);
         SizeAndSignednessVerifier.verify(nativeLibs, codeInfo);
         return codeInfo;
     }

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/CAnnotationProcessorCache.java

@@ -39,19 +39,20 @@
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.List;
 
-import com.oracle.svm.core.SubstrateUtil;
 import org.graalvm.collections.UnmodifiableEconomicMap;
-import jdk.graal.compiler.options.Option;
+import org.graalvm.nativeimage.ImageSingletons;
+import org.graalvm.nativeimage.Platform;
 
+import com.oracle.svm.core.SubstrateUtil;
 import com.oracle.svm.core.option.HostedOptionKey;
 import com.oracle.svm.core.option.SubstrateOptionsParser;
 import com.oracle.svm.core.util.UserError;
 import com.oracle.svm.hosted.c.info.NativeCodeInfo;
 import com.oracle.svm.hosted.c.query.QueryResultParser;
+
+import jdk.graal.compiler.options.Option;
 import jdk.graal.compiler.options.OptionKey;
 import jdk.graal.compiler.options.OptionValues;
-import org.graalvm.nativeimage.ImageSingletons;
-import org.graalvm.nativeimage.Platform;
 
 /**
  * Cache of pre-computed information for the {@link CAnnotationProcessor}. The cache is helpful to
@@ -103,6 +104,9 @@ public Boolean getValue(OptionValues values) {
         @Option(help = "Directory where information generated by the CAnnotation Processor are cached.")//
         public static final HostedOptionKey<String> CAPCacheDir = new HostedOptionKey<>("");
 
+        @Option(help = "Generate a query (i.e., C source code) if a CAP cache is used but the requested data is not found in the cache.")//
+        public static final HostedOptionKey<Boolean> QueryIfNotInCAPCache = new HostedOptionKey<>(false);
+
         @Option(help = "Exit image generation after C Annotation Processor Cache creation.")//
         public static final HostedOptionKey<Boolean> ExitAfterCAPCache = new HostedOptionKey<>(false);
 
@@ -160,13 +164,17 @@ private static String toPath(NativeCodeInfo nativeCodeInfo) {
         return nativeCodeInfo.getName().replaceAll("\\W", "_").concat(FILE_EXTENSION);
     }
 
-    public void get(NativeLibraries nativeLibs, NativeCodeInfo nativeCodeInfo) {
+    public boolean get(NativeLibraries nativeLibs, NativeCodeInfo nativeCodeInfo) {
         File file = new File(cache, toPath(nativeCodeInfo));
         try (FileInputStream fis = new FileInputStream(file)) {
             QueryResultParser.parse(nativeLibs, nativeCodeInfo, fis);
+            return true;
         } catch (IOException e) {
-            throw UserError.abort("Could not load CAPCache file. Ensure that options %s and %s are used on the same version of your application. Raw error: %s",
-                            Options.UseCAPCache.getName(), Options.NewCAPCache, e.getMessage());
+            if (!CAnnotationProcessorCache.Options.QueryIfNotInCAPCache.getValue()) {
+                throw UserError.abort("Could not load CAPCache file. Ensure that options %s and %s are used on the same version of your application. Raw error: %s",
+                                Options.UseCAPCache.getName(), Options.NewCAPCache, e.getMessage());
+            }
+            return false;
         }
     }