From e63abde39f530028b0089ea477446c1b671a28f1 Mon Sep 17 00:00:00 2001 From: Simon Pilgrim Date: Wed, 5 Feb 2020 15:31:38 +0000 Subject: [PATCH] [clang][driver] Fix null pointer dereference warning inside PrintActions1 (PR43462) As detailed on PR43462, clang static analyzer is complaining about a null pointer dereference as we provide a 'host' toolchain fallback if the ToolChain pointer is null, but then use that pointer anyhow to report the triple. Tests indicate the ToolChain pointer is always valid and the 'host' code path is redundant. Differential Revision: https://reviews.llvm.org/D74046 --- clang/lib/Driver/Driver.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp index 6db791a..f35aab1 100644 --- a/clang/lib/Driver/Driver.cpp +++ b/clang/lib/Driver/Driver.cpp @@ -1848,6 +1848,7 @@ static unsigned PrintActions1(const Compilation &C, Action *A, bool IsFirst = true; OA->doOnEachDependence( [&](Action *A, const ToolChain *TC, const char *BoundArch) { + assert(TC && "Unknown host toolchain"); // E.g. for two CUDA device dependences whose bound arch is sm_20 and // sm_35 this will generate: // "cuda-device" (nvptx64-nvidia-cuda:sm_20) {#ID}, "cuda-device" @@ -1855,13 +1856,9 @@ static unsigned PrintActions1(const Compilation &C, Action *A, if (!IsFirst) os << ", "; os << '"'; - if (TC) - os << A->getOffloadingKindPrefix(); - else - os << "host"; + os << A->getOffloadingKindPrefix(); os << " ("; os << TC->getTriple().normalize(); - if (BoundArch) os << ":" << BoundArch; os << ")"; -- 2.7.4