comments

Author: jhuber6

clang/lib/Driver/Driver.cpp

@@ -948,8 +948,8 @@ getSystemOffloadArchs(Compilation &C, Action::OffloadKind Kind) {
 
     if (!StdoutOrErr) {
       C.getDriver().Diag(diag::err_drv_undetermined_gpu_arch)
-          << Action::GetOffloadKindName(Kind)
-          << llvm::toString(StdoutOrErr.takeError()) << "--offload-arch";
+          << Action::GetOffloadKindName(Kind) << StdoutOrErr.takeError()
+          << "--offload-arch";
       return GPUArchs;
     } else if ((*StdoutOrErr)->getBuffer().empty()) {
       C.getDriver().Diag(diag::err_drv_undetermined_gpu_arch)
@@ -1001,16 +1001,19 @@ inferOffloadToolchains(Compilation &C, Action::OffloadKind Kind) {
       C.getDriver().Diag(clang::diag::err_drv_offload_bad_gpu_arch)
           << "HIP" << Arch;
       return llvm::DenseSet<llvm::StringRef>();
-    } else if (Kind == Action::OFK_Cuda && !IsNVIDIAOffloadArch(ID)) {
+    }
+    if (Kind == Action::OFK_Cuda && !IsNVIDIAOffloadArch(ID)) {
       C.getDriver().Diag(clang::diag::err_drv_offload_bad_gpu_arch)
           << "CUDA" << Arch;
       return llvm::DenseSet<llvm::StringRef>();
-    } else if (Kind == Action::OFK_OpenMP &&
-               (ID == OffloadArch::UNKNOWN || ID == OffloadArch::UNUSED)) {
+    }
+    if (Kind == Action::OFK_OpenMP &&
+        (ID == OffloadArch::UNKNOWN || ID == OffloadArch::UNUSED)) {
       C.getDriver().Diag(clang::diag::err_drv_failed_to_deduce_target_from_arch)
           << Arch;
       return llvm::DenseSet<llvm::StringRef>();
-    } else if (ID == OffloadArch::UNKNOWN || ID == OffloadArch::UNUSED) {
+    }
+    if (ID == OffloadArch::UNKNOWN || ID == OffloadArch::UNUSED) {
       C.getDriver().Diag(clang::diag::err_drv_offload_bad_gpu_arch)
           << "offload" << Arch;
       return llvm::DenseSet<llvm::StringRef>();