From 968422dd6e6735b6066ccbe862b6bc6ab38ce4d6 Mon Sep 17 00:00:00 2001 From: Googler Date: Mon, 15 Feb 2021 10:31:03 -0800 Subject: [PATCH] Explicitly check for PropellerOptimizeInputFile being not null. During fastbuild, PropellerOptimizeInputFile does not exist and this can cause null pointer exception. Explicitly check if this exists before accessing its members. PiperOrigin-RevId: 357591297 --- .../google/devtools/build/lib/rules/cpp/LinkBuildVariables.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariables.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariables.java index 8477ece6a968e9..1d38d7560032bf 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariables.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariables.java @@ -248,6 +248,7 @@ public static CcToolchainVariables setupVariables( } if (featureConfiguration.isEnabled(CppRuleClasses.PROPELLER_OPTIMIZE) + && fdoContext.getPropellerOptimizeInputFile() != null && fdoContext.getPropellerOptimizeInputFile().getLdArtifact() != null) { buildVariables.addStringVariable( PROPELLER_OPTIMIZE_LD_PATH.getVariableName(),