From c2176839395a45371d4b4e796fb1361988bb4c27 Mon Sep 17 00:00:00 2001 From: Meghana Thatishetti Date: Fri, 18 Sep 2020 15:38:41 -0700 Subject: [PATCH 1/3] [SYCL][Driver][NFC] Address klockwork issues Signed-off-by: Meghana Thatishetti --- clang/lib/Driver/ToolChain.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp index faf0b84963926..a53cac8911b47 100644 --- a/clang/lib/Driver/ToolChain.cpp +++ b/clang/lib/Driver/ToolChain.cpp @@ -1255,7 +1255,10 @@ llvm::opt::DerivedArgList *ToolChain::TranslateOffloadTargetArgs( continue; } } - XOffloadTargetArg->setBaseArg(A); + + if (!XOffloadTargetArg) + XOffloadTargetArg->setBaseArg(A); + A = XOffloadTargetArg.release(); AllocatedArgs.push_back(A); DAL->append(A); From 9aa360ecb0d25a1410a2a9ddb8c8d95af4695922 Mon Sep 17 00:00:00 2001 From: Meghana Thatishetti Date: Fri, 18 Sep 2020 15:38:41 -0700 Subject: [PATCH 2/3] [SYCL][Driver][NFC] Address klockwork issues Signed-off-by: Meghana Thatishetti --- clang/lib/Driver/ToolChain.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp index faf0b84963926..0b4966c71db39 100644 --- a/clang/lib/Driver/ToolChain.cpp +++ b/clang/lib/Driver/ToolChain.cpp @@ -1255,7 +1255,10 @@ llvm::opt::DerivedArgList *ToolChain::TranslateOffloadTargetArgs( continue; } } - XOffloadTargetArg->setBaseArg(A); + + if (!XOffloadTargetArg) + XOffloadTargetArg->setBaseArg(A); + A = XOffloadTargetArg.release(); AllocatedArgs.push_back(A); DAL->append(A); From 49515bbbd0247f5fc1fd36c79db3d716c6cf0a5f Mon Sep 17 00:00:00 2001 From: Meghana Thatishetti Date: Mon, 21 Sep 2020 09:26:01 -0700 Subject: [PATCH 3/3] [SYCL][Driver][NFC] Address klockwork issues. --- clang/lib/Driver/ToolChain.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp index 8933670c7da63..7b264290b3e7c 100644 --- a/clang/lib/Driver/ToolChain.cpp +++ b/clang/lib/Driver/ToolChain.cpp @@ -1260,7 +1260,6 @@ llvm::opt::DerivedArgList *ToolChain::TranslateOffloadTargetArgs( continue; XOffloadTargetArg->setBaseArg(A); - A = XOffloadTargetArg.release(); AllocatedArgs.push_back(A); DAL->append(A);