Merge pull request #1173 from martong/fix_resource_dir2

Fix resource dir issue

libcodechecker/analyze/analysis_manager.py

@@ -7,6 +7,7 @@
 """
 
 from collections import defaultdict
+import codecs
 import glob
 import multiprocessing
 import os
@@ -148,6 +149,7 @@ def __eliminate_argument(arg_vect, opt_strings, num_args=0):
         output, rc = util.call_command(command,
                                        env=os.environ,
                                        cwd=action.directory)
+        output = codecs.decode(output, 'utf-8', 'replace')
         if rc == 0:
             # Parse 'Makefile' syntax dependency output.
             dependencies = output.replace('__dummy: ', '') \

libcodechecker/analyze/analyzer_env.py

@@ -70,7 +70,8 @@ def get_check_env(path_env_extra, ld_lib_path_extra):
     return new_env
 
 
-def extend_analyzer_cmd_with_resource_dir(analyzer_cmd, compiler_resource_dir):
+def extend_analyzer_cmd_with_resource_dir(analyzer_cmd,
+                                          compiler_resource_dir):
     """
     GCC and Clang handles the certain compiler intrinsics for specific
     instruction sets (like SSE, AVX) differently.  They have their own set of
@@ -95,6 +96,14 @@ def extend_analyzer_cmd_with_resource_dir(analyzer_cmd, compiler_resource_dir):
     and describes our intentions more cleanly if we just simply disable the
     inludes from the resource dir.
     """
-    if len(compiler_resource_dir) > 0:
-        analyzer_cmd.extend(['-nobuiltininc',
-                             '-isystem', compiler_resource_dir])
+    if len(compiler_resource_dir) == 0:
+        return
+
+    resource_inc = compiler_resource_dir
+    # Resource include path must end with "/include".
+    basename = os.path.basename(os.path.normpath(resource_inc))
+    if basename != 'include':
+        resource_inc = os.path.join(resource_inc, "include")
+
+    analyzer_cmd.extend(['-nobuiltininc',
+                         '-isystem', resource_inc])

libcodechecker/analyze/analyzers/analyzer_clang_tidy.py

@@ -94,8 +94,6 @@ def construct_analyzer_cmd(self, res_handler):
 
             analyzer_cmd.append('-Qunused-arguments')
 
-            extend_analyzer_cmd_with_resource_dir(analyzer_cmd,
-                                                  config.compiler_resource_dir)
             # Set language.
             analyzer_cmd.extend(['-x', self.buildaction.lang])
 
@@ -106,6 +104,9 @@ def construct_analyzer_cmd(self, res_handler):
 
             analyzer_cmd.extend(self.buildaction.compiler_includes)
 
+            extend_analyzer_cmd_with_resource_dir(analyzer_cmd,
+                                                  config.compiler_resource_dir)
+
             return analyzer_cmd
 
         except Exception as ex:

libcodechecker/analyze/analyzers/analyzer_clangsa.py

@@ -90,9 +90,6 @@ def construct_analyzer_cmd(self, result_handler):
 
             analyzer_cmd = [config.analyzer_binary]
 
-            extend_analyzer_cmd_with_resource_dir(analyzer_cmd,
-                                                  config.compiler_resource_dir)
-
             # Do not warn about the unused gcc/g++ arguments.
             analyzer_cmd.append('-Qunused-arguments')
 
@@ -151,6 +148,9 @@ def construct_analyzer_cmd(self, result_handler):
 
             analyzer_cmd.extend(self.buildaction.compiler_includes)
 
+            extend_analyzer_cmd_with_resource_dir(analyzer_cmd,
+                                                  config.compiler_resource_dir)
+
             analyzer_cmd.append(self.source_file)
 
             return analyzer_cmd

libcodechecker/analyze/analyzers/analyzer_types.py

@@ -266,6 +266,19 @@ def replacer(matchobj):
     return replacer
 
 
+def __get_compiler_resource_dir(context, analyzer_binary):
+    resource_dir = ''
+    if len(context.compiler_resource_dir) > 0:
+        resource_dir = context.compiler_resource_dir
+    # If not set then ask the binary for the resource dir.
+    else:
+        # Can be None if Clang is too old.
+        resource_dir = host_check.get_resource_dir(analyzer_binary)
+        if resource_dir is None:
+            resource_dir = ""
+    return resource_dir
+
+
 def __build_clangsa_config_handler(args, context):
     """
     Build the config handler for clang static analyzer.
@@ -275,7 +288,8 @@ def __build_clangsa_config_handler(args, context):
     config_handler = config_handler_clangsa.ClangSAConfigHandler()
     config_handler.analyzer_plugins_dir = context.checker_plugin
     config_handler.analyzer_binary = context.analyzer_binaries.get(CLANG_SA)
-    config_handler.compiler_resource_dir = context.compiler_resource_dir
+    config_handler.compiler_resource_dir =\
+        __get_compiler_resource_dir(context, config_handler.analyzer_binary)
 
     if 'ctu_phases' in args:
         config_handler.ctu_dir = os.path.join(args.output_path,
@@ -337,7 +351,24 @@ def __build_clang_tidy_config_handler(args, context):
 
     config_handler = config_handler_clang_tidy.ClangTidyConfigHandler()
     config_handler.analyzer_binary = context.analyzer_binaries.get(CLANG_TIDY)
-    config_handler.compiler_resource_dir = context.compiler_resource_dir
+
+    # FIXME We cannot get the resource dir from the clang-tidy binary,
+    # therefore now we get a clang binary which is a sibling of the clang-tidy.
+    # TODO Support "clang-tidy -print-resource-dir" .
+    check_env = analyzer_env.get_check_env(context.path_env_extra,
+                                           context.ld_lib_path_extra)
+    # Overwrite PATH to contain only the parent of the clang binary.
+    if os.path.isabs(config_handler.analyzer_binary):
+        check_env['PATH'] = os.path.dirname(config_handler.analyzer_binary)
+    clang_bin = analyzer_clangsa.ClangSA.resolve_missing_binary('clang',
+                                                                check_env)
+    if os.path.isfile(clang_bin):
+        config_handler.compiler_resource_dir =\
+            __get_compiler_resource_dir(context, clang_bin)
+    else:
+        config_handler.compiler_resource_dir =\
+            __get_compiler_resource_dir(context,
+                                        config_handler.analyzer_binary)
 
     try:
         with open(args.tidy_args_cfg_file, 'rb') as tidy_cfg:

libcodechecker/analyze/analyzers/ctu_triple_arch.py

@@ -19,9 +19,9 @@ def get_compile_command(action, config, source='', output=''):
     for other operations. """
 
     cmd = [config.analyzer_binary]
+    cmd.extend(action.compiler_includes)
     extend_analyzer_cmd_with_resource_dir(cmd,
                                           config.compiler_resource_dir)
-    cmd.extend(action.compiler_includes)
     cmd.append('-c')
     cmd.extend(['-x', action.lang])
     cmd.append(config.analyzer_extra_arguments)

libcodechecker/analyze/host_check.py

@@ -59,3 +59,29 @@ def has_analyzer_feature(clang_bin, feature):
         except OSError:
             LOG.error('Failed to run: "' + ' '.join(cmd) + '"')
             raise
+
+
+def get_resource_dir(clang_bin):
+    """
+    Returns the resource_dir of Clang or None if the switch is not supported by
+    Clang.
+    """
+    cmd = [clang_bin, "-print-resource-dir"]
+    LOG.debug('run: "' + ' '.join(cmd) + '"')
+    try:
+        proc = subprocess.Popen(cmd,
+                                stdout=subprocess.PIPE,
+                                stderr=subprocess.PIPE,
+                                )
+        out, err = proc.communicate()
+
+        LOG.debug("stdout:\n" + out)
+        LOG.debug("stderr:\n" + err)
+
+        if proc.returncode == 0:
+            return out.decode("utf-8").rstrip()
+        else:
+            return None
+    except OSError:
+        LOG.error('Failed to run: "' + ' '.join(cmd) + '"')
+        raise