From bea0ce9ff99e08fefea0c39656751123b2cf153e Mon Sep 17 00:00:00 2001
From: Tamas Vajk <tamasvajk@github.com>
Date: Fri, 2 Sep 2022 09:20:20 +0200
Subject: [PATCH] Fix review findings

---
 java/ql/lib/semmle/code/java/Modifier.qll | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/java/ql/lib/semmle/code/java/Modifier.qll b/java/ql/lib/semmle/code/java/Modifier.qll
index 83795ca32bd..613616d222f 100644
--- a/java/ql/lib/semmle/code/java/Modifier.qll
+++ b/java/ql/lib/semmle/code/java/Modifier.qll
@@ -31,15 +31,7 @@ abstract class Modifiable extends Element {
    * abstract, so `isAbstract()` will hold for them even if `hasModifier("abstract")`
    * does not.
    */
-  predicate hasModifier(string m) {
-    exists(Modifier mod | mod = this.getAModifier() |
-      modifiers(mod, m) and
-      // Kotlin "internal" elements may also get "public" modifiers, so we want to filter those out
-      not exists(Modifier mod2 |
-        hasModifier(this, mod2) and modifiers(mod, "public") and modifiers(mod2, "internal")
-      )
-    )
-  }
+  predicate hasModifier(string m) { modifiers(this.getAModifier(), m) }
 
   /** Holds if this element has no modifier. */
   predicate hasNoModifier() { not hasModifier(this, _) }