Index: lib/Driver/Tools.cpp
===================================================================
--- lib/Driver/Tools.cpp
+++ lib/Driver/Tools.cpp
@@ -10651,8 +10651,7 @@
                                     const char *LinkingOutput) const {
   const auto &TC =
       static_cast<const toolchains::CudaToolChain &>(getToolChain());
-  assert(TC.getArch() == llvm::Triple::nvptx ||
-         TC.getArch() == llvm::Triple::nvptx64);
+  assert(TC.getTriple().isNVPTX());
 
   std::vector<std::string> gpu_archs =
       Args.getAllArgValues(options::OPT_march_EQ);
@@ -10720,8 +10719,7 @@
                                  const char *LinkingOutput) const {
   const auto &TC =
       static_cast<const toolchains::CudaToolChain &>(getToolChain());
-  assert(TC.getArch() == llvm::Triple::nvptx ||
-         TC.getArch() == llvm::Triple::nvptx64);
+  assert(TC.getTriple().isNVPTX());
 
   ArgStringList CmdArgs;
   CmdArgs.push_back("--cuda");