From 45a5c22345e079175eb560d0e2d428099bbefe70 Mon Sep 17 00:00:00 2001 From: Manu Sridharan Date: Fri, 4 Aug 2023 15:24:32 -0700 Subject: [PATCH] Update to WALA 1.6.2 --- gradle/dependencies.gradle | 2 +- .../uber/nullaway/jarinfer/DefinitelyDerefedParamsDriver.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 2194d2c9d1..a61f34c6a2 100755 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -48,7 +48,7 @@ def versions = [ // The version of Error Prone that NullAway is compiled and tested against errorProneApi : errorProneVersionToCompileAgainst, support : "27.1.1", - wala : "1.6.1", + wala : "1.6.2", commonscli : "1.4", autoValue : "1.9", autoService : "1.0.1", diff --git a/jar-infer/jar-infer-lib/src/main/java/com/uber/nullaway/jarinfer/DefinitelyDerefedParamsDriver.java b/jar-infer/jar-infer-lib/src/main/java/com/uber/nullaway/jarinfer/DefinitelyDerefedParamsDriver.java index 6eb0c10c24..fc852414fb 100644 --- a/jar-infer/jar-infer-lib/src/main/java/com/uber/nullaway/jarinfer/DefinitelyDerefedParamsDriver.java +++ b/jar-infer/jar-infer-lib/src/main/java/com/uber/nullaway/jarinfer/DefinitelyDerefedParamsDriver.java @@ -228,7 +228,7 @@ private void analyzeFile(String pkgName, String inPath, boolean includeNonPublic } else if (!new File(inPath).exists()) { return; } - AnalysisScope scope = AnalysisScopeReader.instance.makePrimordialScope(null); + AnalysisScope scope = AnalysisScopeReader.instance.makeBasePrimordialScope(null); scope.setExclusions( new FileOfClasses( new ByteArrayInputStream(DEFAULT_EXCLUSIONS.getBytes(StandardCharsets.UTF_8))));