Merge pull request #10486 from erik-krogh/java-unqueryable

erik-krogh · web-flow · commit 6e6880bbe42b · 2022-09-22T14:21:39.000+02:00
Java: Delete some unused code
diff --git a/java/ql/lib/semmle/code/java/security/regexp/NfaUtilsSpecific.qll b/java/ql/lib/semmle/code/java/security/regexp/NfaUtilsSpecific.qll
@@ -61,7 +61,7 @@ module RegExpFlags {
   /**
    * Gets the flags for `root`, or the empty string if `root` has no flags.
    */
-  string getFlags(RegExpTerm root) {
+  deprecated string getFlags(RegExpTerm root) {
     root.isRootTerm() and
     result = root.getLiteral().getFlags()
   }
diff --git a/java/ql/src/Violations of Best Practice/Naming Conventions/Shadowing.qll b/java/ql/src/Violations of Best Practice/Naming Conventions/Shadowing.qll
@@ -1,9 +1,5 @@
 import java
 
-predicate initializedToField(LocalVariableDecl d, Field f) {
-  exists(LocalVariableDeclExpr e | e.getVariable() = d and f.getAnAccess() = e.getInit())
-}
-
 predicate getterFor(Method m, Field f) {
   m.getName().matches("get%") and
   m.getDeclaringType() = f.getDeclaringType() and

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ module RegExpFlags {`
`61`	`61`	`/**`
`62`	`62`	* Gets the flags for `root`, or the empty string if `root` has no flags.
`63`	`63`	`*/`
`64`		`- string getFlags(RegExpTerm root) {`
	`64`	`+ deprecated string getFlags(RegExpTerm root) {`
`65`	`65`	`root.isRootTerm() and`
`66`	`66`	`result = root.getLiteral().getFlags()`
`67`	`67`	`}`