Merge pull request #12646 from igfoo/igfoo/expanded_args

Java: Store expanded args in the database
github · Mar 31, 2023 · c1a7d7f · c1a7d7f
2 parents 1e1a692 + 3d85c4f
commit c1a7d7f
Show file tree

Hide file tree

Showing 11 changed files with 6,824 additions and 1,418 deletions.
diff --git a/java/downgrades/7cbc85b1f3ecda39661ad4806dedbd0973d2c4c0/old.dbscheme b/java/downgrades/7cbc85b1f3ecda39661ad4806dedbd0973d2c4c0/old.dbscheme
diff --git a/java/downgrades/7cbc85b1f3ecda39661ad4806dedbd0973d2c4c0/semmlecode.dbscheme b/java/downgrades/7cbc85b1f3ecda39661ad4806dedbd0973d2c4c0/semmlecode.dbscheme
diff --git a/java/downgrades/7cbc85b1f3ecda39661ad4806dedbd0973d2c4c0/upgrade.properties b/java/downgrades/7cbc85b1f3ecda39661ad4806dedbd0973d2c4c0/upgrade.properties
@@ -0,0 +1,3 @@
+description: Remove compilation_expanded_args
+compatibility: full
+compilation_expanded_args.rel: delete
diff --git a/java/ql/lib/change-notes/2023-03-22-expanded-args.md b/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.
diff --git a/java/ql/lib/change-notes/2023-03-31-compilation-names.md b/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.
diff --git a/java/ql/lib/config/semmlecode.dbscheme b/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