Merge pull request #12646 from igfoo/igfoo/expanded_args

Java: Store expanded args in the database

java/downgrades/7cbc85b1f3ecda39661ad4806dedbd0973d2c4c0/upgrade.properties

@@ -0,0 +1,3 @@
+description: Remove compilation_expanded_args
+compatibility: full
+compilation_expanded_args.rel: delete

java/ql/lib/change-notes/2023-03-22-expanded-args.md

@@ -0,0 +1,4 @@
+---
+category: feature
+---
+* Predicates `Compilation.getExpandedArgument` and `Compilation.getAnExpandedArgument` has been added.

java/ql/lib/change-notes/2023-03-31-compilation-names.md

@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* The filenames embedded in `Compilation.toString()` now use `/` as the path separator on all platforms.

java/ql/lib/config/semmlecode.dbscheme

@@ -60,6 +60,19 @@ compilation_args(
     string arg : string ref
 );
 
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@@@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
 /**
  * The source files that are compiled by a compiler invocation.
  * If `id` is for the compiler invocation

java/ql/lib/semmle/code/java/Compilation.qll

@@ -83,6 +83,16 @@ class Compilation extends @compilation {
    */
   string getArgument(int i) { compilation_args(this, i, result) }
 
+  /**
+   * Gets an expanded argument passed to the extractor on this invocation.
+   */
+  string getAnExpandedArgument() { result = getExpandedArgument(_) }
+
+  /**
+   * Gets the `i`th expanded argument passed to the extractor on this invocation.
+   */
+  string getExpandedArgument(int i) { compilation_expanded_args(this, i, result) }
+
   /**
    * Gets the total amount of CPU time spent processing all the files in the
    * compiler.

java/ql/lib/upgrades/934bf10b4bd34cf648893efcd1d0d7be9471d39f/upgrade.properties

@@ -0,0 +1,2 @@
+description: Add compilation_expanded_args
+compatibility: backwards