Adjust behaviors for review comments

Use separate DenseMap for exit behaviors
Update names and usage model to avoid double negatives

Author: mdtoguchi

clang/include/clang/Driver/Job.h

@@ -105,7 +105,8 @@ struct ResponseFileSupport {
 /// execute.
 class Command {
 public:
-  using ErrorCodeDiagMapTy = llvm::DenseMap<int, std::pair<std::string, bool>>;
+  using ErrorCodeDiagMapTy = llvm::DenseMap<int, std::string>;
+  using ErrorCodeExitMapTy = llvm::DenseMap<int, bool>;
 
 private:
   /// Source - The action which caused the creation of this job.
@@ -122,8 +123,6 @@ class Command {
 
   /// The container for custom driver-set diagnostic messages that are
   /// produced upon particular error codes returned by the command.
-  /// Given a custom diagnostic, also allow for logic to determine if the
-  /// compilation should continue, even with a non-zero return code.
   /// In order to add such a diagnostic for an external tool, consider the
   /// following criteria:
   /// 1) Does the command's executable return different codes upon different
@@ -134,6 +133,11 @@ class Command {
   ///    "invalid input" error can be ruled out
   ErrorCodeDiagMapTy ErrorCodeDiagMap;
 
+  /// Similar to the container for the diagnostic messages, this container
+  /// is used to signify if the toolchain should error and exit right away
+  /// or if we should continue compilation.
+  ErrorCodeExitMapTy ErrorCodeExitMap;
+
   /// The list of program arguments (not including the implicit first
   /// argument, which will be the executable).
   llvm::opt::ArgStringList Arguments;
@@ -198,17 +202,20 @@ class Command {
 
   /// Store a custom driver diagnostic message and if the compilation should
   /// exit upon a particular error code returned by the command
-  void addDiagForErrorCode(int ErrorCode, StringRef CustomDiag,
-                           bool NoExit = false);
+  void addDiagForErrorCode(int ErrorCode, StringRef CustomDiag);
+
+  /// Store if the compilation should exit upon a particular error code
+  /// returned by the command
+  void addExitForErrorCode(int ErrorCode, bool Exit);
 
   /// Get the custom driver diagnostic message for a particular error code
   /// if such was stored. Returns an empty string if no diagnostic message
   /// was found for the given error code.
   StringRef getDiagForErrorCode(int ErrorCode) const;
 
   /// Will the tool exit when a particular error code is encountered. Returns
-  /// false if not set (always exit)
-  bool getWillNotExitForErrorCode(int ErrorCode) const;
+  /// true if not set (always exit)
+  bool getWillExitForErrorCode(int ErrorCode) const;
 
   /// getSource - Return the Action which caused the creation of this job.
   const Action &getSource() const { return Source; }

clang/lib/Driver/Compilation.cpp

@@ -250,7 +250,7 @@ static bool ActionFailed(const Action *A,
     return false;
 
   for (const auto &CI : FailingCommands)
-    if (CI.second->getWillNotExitForErrorCode(CI.first))
+    if (!CI.second->getWillExitForErrorCode(CI.first))
       return false;
 
   // CUDA/HIP/SYCL can have the same input source code compiled multiple times
@@ -292,7 +292,7 @@ void Compilation::ExecuteJobs(const JobList &Jobs,
       // Do not bail when the tool is setup to allow for continuation upon
       // failure.
       if (TheDriver.IsCLMode() &&
-          !FailingCommand->getWillNotExitForErrorCode(Res))
+          FailingCommand->getWillExitForErrorCode(Res))
         return;
     }
   }

clang/lib/Driver/Job.cpp

@@ -158,24 +158,26 @@ void Command::buildArgvForResponseFile(
   }
 }
 
-void Command::addDiagForErrorCode(int ErrorCode, StringRef CustomDiag,
-                                  bool NoExit) {
-  ErrorCodeDiagMap[ErrorCode].first = CustomDiag.str();
-  ErrorCodeDiagMap[ErrorCode].second = NoExit;
+void Command::addDiagForErrorCode(int ErrorCode, StringRef CustomDiag) {
+  ErrorCodeDiagMap[ErrorCode] = CustomDiag.str();
+}
+
+void Command::addExitForErrorCode(int ErrorCode, bool Exit) {
+  ErrorCodeExitMap[ErrorCode] = Exit;
 }
 
 StringRef Command::getDiagForErrorCode(int ErrorCode) const {
   auto ErrorCodeDiagIt = ErrorCodeDiagMap.find(ErrorCode);
   if (ErrorCodeDiagIt != ErrorCodeDiagMap.end())
-    return ErrorCodeDiagIt->second.first;
+    return ErrorCodeDiagIt->second;
   return StringRef();
 }
 
-bool Command::getWillNotExitForErrorCode(int ErrorCode) const {
-  auto ErrorCodeDiagIt = ErrorCodeDiagMap.find(ErrorCode);
-  if (ErrorCodeDiagIt != ErrorCodeDiagMap.end())
-    return ErrorCodeDiagIt->second.second;
-  return false;
+bool Command::getWillExitForErrorCode(int ErrorCode) const {
+  auto ErrorCodeExitIt = ErrorCodeExitMap.find(ErrorCode);
+  if (ErrorCodeExitIt != ErrorCodeExitMap.end())
+    return ErrorCodeExitIt->second;
+  return true;
 }
 
 /// Rewrite relative include-like flag paths to absolute ones.

clang/lib/Driver/ToolChains/SYCL.cpp

@@ -89,7 +89,8 @@ static void addFPGATimingDiagnostic(std::unique_ptr<Command> &Cmd,
       "and may produce functional errors if used. Refer to the Intel oneAPI "
       "DPC++ FPGA Optimization Guide section on Timing Failures for more "
       "information.");
-  Cmd->addDiagForErrorCode(/*ErrorCode*/ 42, Msg, true);
+  Cmd->addDiagForErrorCode(/*ErrorCode*/ 42, Msg);
+  Cmd->addExitForErrorCode(/*ErrorCode*/ 42, false);
 }
 
 void SYCL::constructLLVMForeachCommand(Compilation &C, const JobAction &JA,