From 5ce2573cc1548ebff5e0c051f3c2cb496b21a1ca Mon Sep 17 00:00:00 2001
From: Tamas Vajk <tamasvajk@github.com>
Date: Fri, 13 May 2022 11:08:32 +0200
Subject: [PATCH] Kotlin: Respect `override` modifier in useless parameter
 query

---
 java/ql/lib/semmle/code/java/deadcode/DeadCode.qll              | 2 ++
 .../query-tests/UselessParameter/UselessParameter.expected      | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/ql/lib/semmle/code/java/deadcode/DeadCode.qll b/java/ql/lib/semmle/code/java/deadcode/DeadCode.qll
index ed77dff0a82..f0ddffa9aa2 100644
--- a/java/ql/lib/semmle/code/java/deadcode/DeadCode.qll
+++ b/java/ql/lib/semmle/code/java/deadcode/DeadCode.qll
@@ -302,6 +302,8 @@ class RootdefCallable extends Callable {
     exists(MemberRefExpr mre | mre.getReferencedCallable() = this)
     or
     this.getAnAnnotation() instanceof OverrideAnnotation
+    or
+    this.hasModifier("override")
   }
 }
 
diff --git a/java/ql/test/kotlin/query-tests/UselessParameter/UselessParameter.expected b/java/ql/test/kotlin/query-tests/UselessParameter/UselessParameter.expected
index fac9a4eb778..e69de29bb2d 100644
--- a/java/ql/test/kotlin/query-tests/UselessParameter/UselessParameter.expected
+++ b/java/ql/test/kotlin/query-tests/UselessParameter/UselessParameter.expected
@@ -1,2 +0,0 @@
-| Test.kt:6:27:6:30 | a | The parameter a is unused. |
-| Test.kt:6:33:6:38 | b | The parameter b is unused. |