[opt] Fix static code analysis concerns

[asudarsa]

Summary

This is an issue reported inside the NewPMDriver module. Static analyzer reported that Null pointer 'P' may be dereferenced at line 371 and two more sites. Proposed change guards this use.

[aeubanks]

llvm/tools/opt/NewPMDriver.cpp

374–376

we should instead return false anywhere we're printing an error message

[asudarsa]

Hi @aeubanks

Thanks a lot for your review. I have updated the review based on your comment. Hope this works.

@asudarsa

[asudarsa]

llvm/tools/opt/NewPMDriver.cpp

374–376

Thanks for the review. I have addressed it.

[aeubanks]

llvm/tools/opt/NewPMDriver.cpp

374–376

sorry, could you also update the two places above that print an error message?

[asudarsa]

Based on reviewer's comments, two more code-sites had this issue and have been fixed. Thanks

[aeubanks]

lgtm

do you need me to push this for you?

[asudarsa]

In D142047#4066364, @aeubanks wrote:

lgtm

do you need me to push this for you?

Yes please. That will be great.

Thanks again

llvm/tools/opt/NewPMDriver.cpp

374–376

That's a good catch. Thanks @aeubanks. I have updated them as well. I verified that there are no other sites in this module.

[aeubanks]

In D142047#4066443, @asudarsa wrote:

In D142047#4066364, @aeubanks wrote:

lgtm

do you need me to push this for you?

Yes please. That will be great.

Thanks again

do you have a name/email you'd like to use in the git commit?

[asudarsa]

In D142047#4066455, @aeubanks wrote:

In D142047#4066443, @asudarsa wrote:

In D142047#4066364, @aeubanks wrote:

lgtm

do you need me to push this for you?

Yes please. That will be great.

Thanks again

do you have a name/email you'd like to use in the git commit?

Ah. This is my first commit in a while. Sorry for missing these steps.
Name: Arvind Sudarsanam
Email address: [e-mail]

llvm/tools/opt/NewPMDriver.cpp

case NoPGO:
     if (DebugInfoForProfiling || PseudoProbeForProfiling)
       P = PGOOptions("", "", "", PGOOptions::NoAction, PGOOptions::NoCSAction,
                      DebugInfoForProfiling, PseudoProbeForProfiling);
     else
       P = std::nullopt;
   }
   if (CSPGOKindFlag != NoCSPGO) {
     if (P && (P->Action == PGOOptions::IRInstr ||
-              P->Action == PGOOptions::SampleUse))
+              P->Action == PGOOptions::SampleUse)) {
       errs() << "CSPGOKind cannot be used with IRInstr or SampleUse";
+      return false;
+    }
     if (CSPGOKindFlag == CSInstrGen) {
-      if (CSProfileGenFile.empty())
+      if (CSProfileGenFile.empty()) {
         errs() << "CSInstrGen needs to specify CSProfileGenFile";
+        return false;
+      }
       if (P) {
         P->CSAction = PGOOptions::CSIRInstr;
         P->CSProfileGenFile = CSProfileGenFile;
       } else
         P = PGOOptions("", CSProfileGenFile, ProfileRemappingFile,
                        PGOOptions::NoAction, PGOOptions::CSIRInstr);
     } else /* CSPGOKindFlag == CSInstrUse */ {
-      if (!P)
+      if (!P) {
         errs() << "CSInstrUse needs to be together with InstrUse";
+        return false;
+      }
       P->CSAction = PGOOptions::CSIRUse;
     }
   }
   if (TM)
     TM->setPGOOption(P);
 
   LoopAnalysisManager LAM;
   FunctionAnalysisManager FAM;