Skip to content

Commit

Permalink
Replace javasrc2cpg ReflectionTypeSolver with JdkJarTypeSolver at jav…
Browse files Browse the repository at this point in the history
…a home
  • Loading branch information
johannescoetzee committed Jul 19, 2023
1 parent ffa8f26 commit e2f29b0
Showing 1 changed file with 6 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -90,15 +90,14 @@ class AstCreationPass(config: Config, cpg: Cpg, preCreatedAsts: Option[SplitJpAs

val combinedTypeSolver = new SimpleCombinedTypeSolver()

config.jdkPath match {
case Some(path) =>
val jdkJarTypeSolver = JdkJarTypeSolver.fromJdkPath(path)
combinedTypeSolver.add(jdkJarTypeSolver)

case None =>
combinedTypeSolver.add(new CachingReflectionTypeSolver())
val jdkPath = config.jdkPath.getOrElse {
val javaHome = System.getProperty("java.home")
logger.debug("No explicit jdkPath set in config, so using system java.home at $javaHome")
javaHome
}

combinedTypeSolver.add(JdkJarTypeSolver.fromJdkPath(jdkPath))

val sourceTypeSolver = EagerSourceTypeSolver(typesAsts, combinedTypeSolver)
// The sourceTypeSolver will often be the fastest due to there being no possibility of encountering a SOE on lookup.
combinedTypeSolver.prepend(sourceTypeSolver)
Expand Down

0 comments on commit e2f29b0

Please sign in to comment.