Merge pull request #10936 from smowton/smowton/fix/internal-constructor-called-from-java

Kotlin: make internal constructors' trap labels consistent with the Java extractor

Author: smowton

java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt

@@ -813,7 +813,7 @@ open class KotlinUsesExtractor(
                 OperatorNameConventions.INVOKE.asString())
 
         fun getSuffixIfInternal() =
-            if (f.visibility == DescriptorVisibilities.INTERNAL) {
+            if (f.visibility == DescriptorVisibilities.INTERNAL && f !is IrConstructor) {
                 "\$" + getJvmModuleName(f)
             } else {
                 ""

java/ql/test/kotlin/library-tests/internal-constructor-called-from-java/User.java

@@ -0,0 +1,5 @@
+public class User {
+
+  public static void test() { new Test(1, 2); }
+
+}

java/ql/test/kotlin/library-tests/internal-constructor-called-from-java/test.expected

@@ -0,0 +1 @@
+| User.java:3:31:3:44 | new Test(...) | test.kt:3:3:3:51 | { ... } |

java/ql/test/kotlin/library-tests/internal-constructor-called-from-java/test.kt

@@ -0,0 +1,5 @@
+public class Test() {
+
+  internal constructor(x: Int, y: Int) : this() { }
+
+}

java/ql/test/kotlin/library-tests/internal-constructor-called-from-java/test.ql

@@ -0,0 +1,4 @@
+import java
+
+from ClassInstanceExpr ce
+select ce, ce.getConstructor().getBody()