Java: CompilationUnit elements in Module are `.class` files instead of `.java` files

[Marcono1234]

There are two predicates for matching CompilationUnit to corresponding Module, Module.getACompilationUnit() and CompilationUnit.getModule() (both using the database predicate cumodule(@file, @module)).
The issue is that the reported compilation units appear to always be the .class files instead of the source .java files, even when the module-info.java file was part of the source.

For example the following query against OpenJDK has no results:

import java

from Module m, RefType t
where
  t.fromSource()
  and t.getCompilationUnit().getModule() = m
select m, t

Query Console link

However, if you manually try to match .class compilation units with .java compilation units, you will get the desired results:

import java

predicate areProbablySame(CompilationUnit classComp, CompilationUnit sourceComp) {
  classComp.getPackage() = sourceComp.getPackage()
  and classComp.getName() = sourceComp.getName()
}

from Module m, TopLevelType t, CompilationUnit classComp, CompilationUnit sourceComp
where
  t.fromSource()
  and sourceComp = t.getCompilationUnit()
  and classComp = m.getACompilationUnit()
  and areProbablySame(classComp, sourceComp)
select m, t, classComp.getRelativePath(), sourceComp.getRelativePath()

Query Console link

[aeisenberg]

Thanks for raising this issue.

Our current focus is on improving our security analysis. Because it not obvious that this defect relates to a security query, we will put this on our backlog and prioritize it if we get enough reports of the same underlying issue in other projects. If you think that your report is related to our security analysis, please clarify that in a comment. Either way, we'll let you know here as soon as it's fixed.