diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
index b5f02e5347f96..47b1aab598f62 100644
--- a/clang/lib/Driver/Driver.cpp
+++ b/clang/lib/Driver/Driver.cpp
@@ -4744,7 +4744,7 @@ void Driver::BuildActions(Compilation &C, DerivedArgList &Args,
       }
       UnbundlerInputs.push_back(LI);
     }
-    const Arg *LastArg;
+    const Arg *LastArg = nullptr;
     auto addUnbundlerInput = [&](types::ID T, const StringRef &A) {
       const llvm::opt::OptTable &Opts = getOpts();
       Arg *InputArg = MakeInputArg(Args, Opts, C.getArgs().MakeArgString(A));
diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp
index b2b9658ea25ac..eac748a3c0ef5 100644
--- a/clang/lib/Driver/ToolChains/Clang.cpp
+++ b/clang/lib/Driver/ToolChains/Clang.cpp
@@ -7708,7 +7708,8 @@ void SYCLPostLink::ConstructJob(Compilation &C, const JobAction &JA,
     addArgs(CmdArgs, TCArgs, {"-symbols"});
   }
   // specialization constants processing is mandatory
-  if (llvm::dyn_cast<SYCLPostLinkJobAction>(&JA)->getRTSetsSpecConstants())
+  auto *SYCLPostLink = llvm::dyn_cast<SYCLPostLinkJobAction>(&JA);
+  if (SYCLPostLink && SYCLPostLink->getRTSetsSpecConstants())
     addArgs(CmdArgs, TCArgs, {"-spec-const=rt"});
   else
     addArgs(CmdArgs, TCArgs, {"-spec-const=default"});