From ca3751bb45b1fe27fabe6468acf9a71119a6b0d9 Mon Sep 17 00:00:00 2001
From: Anton Yartsev <anton.yartsev@gmail.com>
Date: Wed, 16 Sep 2015 18:12:15 +0000
Subject: [PATCH] [analyzer] Improved behavior if Clang was not found, part II

- scan-build help: display 'Could not query Clang for the list of available checkers.' + the reason why it happened so if clang was not found.
- display requested/forced help in case of --use-analyzer=Xcode.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@247828 91177308-0d34-0410-b5e6-96231b3b80d8
---
 tools/scan-build/scan-build | 84 ++++++++++++++++++++++---------------
 1 file changed, 50 insertions(+), 34 deletions(-)

diff --git a/tools/scan-build/scan-build b/tools/scan-build/scan-build
index 0e7dcc1f83..4b34256e18 100755
--- a/tools/scan-build/scan-build
+++ b/tools/scan-build/scan-build
@@ -1100,6 +1100,7 @@ sub RunBuildCommand {
 
 sub DisplayHelp {
 
+  my $ArgClangNotFoundErrMsg = shift;
 print <<ENDTEXT;
 USAGE: $Prog [options] <build command> [build options]
 
@@ -1348,6 +1349,12 @@ ENDTEXT
     }
     close PS;
   }
+  else {
+    print "  *** Could not query Clang for the list of available checkers.\n";
+    if (defined  $ArgClangNotFoundErrMsg) {
+      print "  *** Reason: $ArgClangNotFoundErrMsg\n";
+    }
+  }
 
 print <<ENDTEXT
 
@@ -1392,6 +1399,45 @@ sub ShellEscape {
   return $arg;
 }
 
+##----------------------------------------------------------------------------##
+# FindClang - searches for 'clang' executable.
+##----------------------------------------------------------------------------##
+
+sub FindClang {
+  if (!defined $Options{AnalyzerDiscoveryMethod}) {
+    $Clang = Cwd::realpath("$RealBin/bin/clang") if (-f "$RealBin/bin/clang");
+    if (!defined $Clang || ! -x $Clang) {
+      $Clang = Cwd::realpath("$RealBin/clang") if (-f "$RealBin/clang");
+    }
+    if (!defined $Clang || ! -x $Clang) {
+      return "error: Cannot find an executable 'clang' relative to" .
+             " scan-build. Consider using --use-analyzer to pick a version of" .
+             " 'clang' to use for static analysis.\n";
+    }
+  }
+  else {
+    if ($Options{AnalyzerDiscoveryMethod} =~ /^[Xx]code$/) {
+      my $xcrun = `which xcrun`;
+      chomp $xcrun;
+      if ($xcrun eq "") {
+        return "Cannot find 'xcrun' to find 'clang' for analysis.\n";
+      }
+      $Clang = `$xcrun -toolchain XcodeDefault -find clang`;
+      chomp $Clang;
+      if ($Clang eq "") {
+        return "No 'clang' executable found by 'xcrun'\n";
+      }
+    }
+    else {
+      $Clang = $Options{AnalyzerDiscoveryMethod};
+      if (!defined $Clang or not -x $Clang) {
+        return "Cannot find an executable clang at '$Options{AnalyzerDiscoveryMethod}'\n";
+      }
+    }
+  }
+  return undef;
+}
+
 ##----------------------------------------------------------------------------##
 # Process command-line arguments.
 ##----------------------------------------------------------------------------##
@@ -1642,45 +1688,15 @@ if (!@ARGV and !$RequestDisplayHelp) {
   $ForceDisplayHelp = 1;
 }
 
-# Find 'clang'
-if (!defined $Options{AnalyzerDiscoveryMethod}) {
-  $Clang = Cwd::realpath("$RealBin/bin/clang") if (-f "$RealBin/bin/clang");
-  if (!defined $Clang || ! -x $Clang) {
-    $Clang = Cwd::realpath("$RealBin/clang") if (-f "$RealBin/clang");
-  }
-  if (!defined $Clang || ! -x $Clang) {
-    if (!$RequestDisplayHelp && !$ForceDisplayHelp) {
-      DieDiag("error: Cannot find an executable 'clang' relative to scan-build." .
-                 "  Consider using --use-analyzer to pick a version of 'clang' to use for static analysis.\n");
-    }
-  }
-}
-else {
-  if ($Options{AnalyzerDiscoveryMethod} =~ /^[Xx]code$/) {
-    my $xcrun = `which xcrun`;
-    chomp $xcrun;
-    if ($xcrun eq "") {
-        DieDiag("Cannot find 'xcrun' to find 'clang' for analysis.\n");
-    }
-    $Clang = `$xcrun -toolchain XcodeDefault -find clang`;
-    chomp $Clang;
-    if ($Clang eq "") {
-      DieDiag("No 'clang' executable found by 'xcrun'\n");
-    }
-  }
-  else {
-    $Clang = $Options{AnalyzerDiscoveryMethod};
-    if (!defined $Clang or not -x $Clang) {
-      DieDiag("Cannot find an executable clang at '$Options{AnalyzerDiscoveryMethod}'\n");
-    }
-  }
-}
+my $ClangNotFoundErrMsg = FindClang();
 
 if ($ForceDisplayHelp || $RequestDisplayHelp) {
-  DisplayHelp();
+  DisplayHelp($ClangNotFoundErrMsg);
   exit $ForceDisplayHelp;
 }
 
+DieDiag($ClangNotFoundErrMsg) if (defined $ClangNotFoundErrMsg);
+
 $ClangCXX = $Clang;
 if ($Clang !~ /\+\+(\.exe)?$/) {
   # If $Clang holds the name of the clang++ executable then we leave
-- 
2.40.0