From 4b0a1cf74b64952e5c2d3babbd23adad151a32d7 Mon Sep 17 00:00:00 2001 From: Anders Schack-Mulligen Date: Wed, 23 Aug 2023 13:19:16 +0200 Subject: [PATCH] Java: Remove old interpretation. --- .../code/java/dataflow/ExternalFlow.qll | 46 ------------------- 1 file changed, 46 deletions(-) diff --git a/java/ql/lib/semmle/code/java/dataflow/ExternalFlow.qll b/java/ql/lib/semmle/code/java/dataflow/ExternalFlow.qll index 2b20e2e1320..3a9e1347c97 100644 --- a/java/ql/lib/semmle/code/java/dataflow/ExternalFlow.qll +++ b/java/ql/lib/semmle/code/java/dataflow/ExternalFlow.qll @@ -380,58 +380,12 @@ string paramsString(Callable c) { "(" + concat(int i | | getNestedName(c.getParameterType(i).getErasure()), "," order by i) + ")" } -pragma[nomagic] -private string paramsString_old(Callable c) { - result = - "(" + concat(int i | | c.getParameterType(i).getErasure().toString(), "," order by i) + ")" -} - private string paramsStringQualified(Callable c) { result = "(" + concat(int i | | getQualifiedName(c.getParameterType(i).getErasure()), "," order by i) + ")" } -predicate failMatch( - string package, string type, boolean subtypes, string name, string signature, string sig2, - string sigf -) { - elementSpec(package, type, subtypes, name, signature, _) and - not exists(interpretElement0(package, type, subtypes, name, signature)) and - exists(Callable c | - c = interpretElement0_old(package, type, subtypes, name, signature) and - sig2 = paramsString(c) and - sigf = paramsStringQualified(c) - ) -} - -private Element interpretElement0_old( - string package, string type, boolean subtypes, string name, string signature -) { - elementSpec(package, type, subtypes, name, signature, _) and - ( - exists(Member m | - ( - result = m - or - subtypes = true and result.(SrcMethod).overridesOrInstantiates+(m) - ) and - m.hasQualifiedName(package, type, name) - | - signature = "" or - m.(Callable).getSignature() = any(string nameprefix) + signature or - paramsString_old(m) = signature - ) - or - exists(RefType t | - t.hasQualifiedName(package, type) and - (if subtypes = true then result.(SrcRefType).getASourceSupertype*() = t else result = t) and - name = "" and - signature = "" - ) - ) -} - private Element interpretElement0( string package, string type, boolean subtypes, string name, string signature ) {