fix failures

Author: AllanZyne

clang/lib/Driver/SanitizerArgs.cpp

@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 #include "clang/Driver/SanitizerArgs.h"
+#include "clang/Basic/DiagnosticDriver.h"
 #include "clang/Basic/Sanitizers.h"
 #include "clang/Driver/Driver.h"
 #include "clang/Driver/Options.h"
@@ -1319,8 +1320,10 @@ void SanitizerArgs::addArgs(const ToolChain &TC, const llvm::opt::ArgList &Args,
       CmdArgs.push_back("-msan-poison-stack-with-call=1");
 
       if (MsanTrackOrigins) {
-        assert(MsanTrackOrigins == 1 &&
-               "Only support -fsanitize-memory-track-origins=1");
+        // FIXME: Support enhanced origins tracking in device offloading.
+        if (MsanTrackOrigins != 1)
+          TC.getDriver().Diag(diag::err_drv_argument_only_allowed_with)
+              << "-fsanitize-memory-track-origins=1";
         CmdArgs.push_back("-mllvm");
         CmdArgs.push_back(Args.MakeArgString("-msan-track-origins=" +
                                              Twine(MsanTrackOrigins)));

clang/test/Driver/sycl-device-sanitizer.cpp

@@ -49,10 +49,10 @@
 // SYCL-MSAN-SAME: "-mllvm" "-msan-eager-checks=1"
 
 // RUN: %clangxx -fsycl -fsanitize=memory -fsanitize-memory-track-origins=1 -c %s -### 2>&1 \
-// RUN:   | FileCheck --check-prefix=SYCL-MSAN %s
-// SYCL-MSAN: clang{{.*}} "-fsycl-is-device"
-// SYCL-MSAN-SAME: -fsanitize=memory
-// SYCL-MSAN-SAME: "-mllvm" "-msan-track-origins=1"
+// RUN:   | FileCheck --check-prefix=SYCL-MSAN-ORIGIN %s
+// SYCL-MSAN-ORIGIN: clang{{.*}} "-fsycl-is-device"
+// SYCL-MSAN-ORIGIN-SAME: -fsanitize=memory
+// SYCL-MSAN-ORIGIN-SAME: "-mllvm" "-msan-track-origins=1"
 
 // RUN: %clangxx -fsycl -Xarch_device -fsanitize=memory -c %s -### 2>&1 \
 // RUN:   | FileCheck --check-prefix=SYCL-MSAN-XARCH-DEVICE %s