[analyzer] Proper handling of multi-target build

CodeChecker collects implicit compiler info, such as implicit include
paths, default target, etc. If a compilation_database.json contains
build actions with different target compilations (or different sysroot,
etc.) then the implicit infos of the first action will be applied to
all build actions.
With this patch every build action gets its own implicit info.

analyzer/codechecker_analyzer/analysis_manager.py

@@ -272,7 +272,7 @@ def handle_reproducer(source_analyzer, rh, zip_file, actions_map):
 
     for of in other_files:
         mentioned_file = os.path.abspath(os.path.join(action.directory, of))
-        key = mentioned_file, action.target[action.lang]
+        key = mentioned_file, action.target
         mentioned_file_action = actions_map.get(key)
         if mentioned_file_action is not None:
             buildactions.append({

analyzer/codechecker_analyzer/analyzer.py

@@ -60,7 +60,7 @@ def create_actions_map(actions, manager):
     result = manager.dict()
 
     for act in actions:
-        key = act.source, act.target[act.lang]
+        key = act.source, act.target
         if key in result:
             LOG.debug("Multiple entires in compile database "
                       "with the same (source, target) pair: (%s, %s)",

analyzer/codechecker_analyzer/analyzers/clangsa/analyzer.py

@@ -274,27 +274,24 @@ def construct_analyzer_cmd(self, result_handler):
                 analyzer_cmd.extend(['-x', compile_lang])
 
             if not has_flag('--target', analyzer_cmd) and \
-                    self.buildaction.target.get(compile_lang, "") != "":
-                analyzer_cmd.append("--target=" +
-                                    self.buildaction.target.get(compile_lang))
+                    self.buildaction.target != "":
+                analyzer_cmd.append(f"--target={self.buildaction.target}")
 
             if not has_flag('-arch', analyzer_cmd) and \
                     self.buildaction.arch != "":
                 analyzer_cmd.extend(["-arch ", self.buildaction.arch])
 
             if not has_flag('-std', analyzer_cmd) and \
-                    self.buildaction.compiler_standard.get(compile_lang, "") \
-                    != "":
-                analyzer_cmd.append(
-                    self.buildaction.compiler_standard[compile_lang])
+                    self.buildaction.compiler_standard != "":
+                analyzer_cmd.append(self.buildaction.compiler_standard)
 
             analyzer_cmd.extend(config.analyzer_extra_arguments)
 
             analyzer_cmd.extend(self.buildaction.analyzer_options)
 
             analyzer_cmd.extend(prepend_all(
                 '-isystem',
-                self.buildaction.compiler_includes[compile_lang]))
+                self.buildaction.compiler_includes))
 
             analyzer_cmd.append(self.source_file)
 

analyzer/codechecker_analyzer/analyzers/clangsa/ctu_triple_arch.py

@@ -21,13 +21,10 @@ def get_compile_command(action, config, source='', output=''):
 
     cmd = [config.analyzer_binary]
 
-    compile_lang = action.lang
+    if not has_flag('--target', cmd) and action.target != "":
+        cmd.append(f"--target={action.target}")
 
-    if not has_flag('--target', cmd) and \
-            action.target[compile_lang] != "":
-        cmd.append("--target=" + action.target[compile_lang])
-
-    cmd.extend(prepend_all('-isystem', action.compiler_includes[compile_lang]))
+    cmd.extend(prepend_all('-isystem', action.compiler_includes))
     cmd.append('-c')
     if not has_flag('-x', cmd):
         cmd.extend(['-x', action.lang])
@@ -40,7 +37,7 @@ def get_compile_command(action, config, source='', output=''):
         cmd.append(source)
 
     if not has_flag('-std', cmd) and not has_flag('--std', cmd):
-        cmd.append(action.compiler_standard.get(compile_lang, ""))
+        cmd.append(action.compiler_standard)
     return cmd
 
 

analyzer/codechecker_analyzer/analyzers/clangsa/statistics.py

@@ -59,23 +59,19 @@ def build_stat_coll_cmd(action, config, source):
         return [], False
 
     for coll_check in collector_checkers:
-        cmd.extend(['-Xclang',
-                    '-analyzer-checker=' + coll_check])
+        cmd.extend(['-Xclang', f'-analyzer-checker={coll_check}'])
 
     compile_lang = action.lang
     if not has_flag('-x', cmd):
         cmd.extend(['-x', compile_lang])
 
-    if not has_flag('--target', cmd) and \
-            action.target.get(compile_lang, "") != "":
-        cmd.append("--target=" + action.target[compile_lang])
+    if not has_flag('--target', cmd) and action.target != "":
+        cmd.append(f"--target={action.target}")
 
     if not has_flag('-std', cmd) and not has_flag('--std', cmd):
-        cmd.append(action.compiler_standard.get(compile_lang, ""))
+        cmd.append(action.compiler_standard)
 
-    cmd.extend(prepend_all(
-        '-isystem',
-        action.compiler_includes.get(compile_lang, [])))
+    cmd.extend(prepend_all('-isystem', action.compiler_includes))
 
     if source:
         cmd.append(source)

analyzer/codechecker_analyzer/analyzers/clangtidy/analyzer.py

@@ -242,10 +242,8 @@ def construct_analyzer_cmd(self, result_handler):
                 analyzer_cmd.extend(['-x', compile_lang])
 
             if not has_flag('--target', analyzer_cmd) and \
-                    self.buildaction.target.get(compile_lang, "") != "":
-                analyzer_cmd.append(
-                    "--target=" + self.buildaction.target.get(compile_lang,
-                                                              ""))
+                    self.buildaction.target != "":
+                analyzer_cmd.append(f"--target={self.buildaction.target}")
 
             if not has_flag('-arch', analyzer_cmd) and \
                     self.buildaction.arch != "":
@@ -255,12 +253,11 @@ def construct_analyzer_cmd(self, result_handler):
 
             analyzer_cmd.extend(prepend_all(
                 '-isystem',
-                self.buildaction.compiler_includes[compile_lang]))
+                self.buildaction.compiler_includes))
 
             if not has_flag('-std', analyzer_cmd) and not \
                     has_flag('--std', analyzer_cmd):
-                analyzer_cmd.append(
-                    self.buildaction.compiler_standard.get(compile_lang, ""))
+                analyzer_cmd.append(self.buildaction.compiler_standard)
 
             analyzer_cmd.extend(compiler_warnings)
 

analyzer/codechecker_analyzer/buildlog/build_action.py

@@ -73,7 +73,7 @@ def __hash__(self):
         hash_content = []
         hash_content.extend(self.analyzer_options)
         hash_content.append(str(self.analyzer_type))
-        hash_content.append(self.target[self.lang])
+        hash_content.append(self.target)
         hash_content.append(self.source)
         return hash(''.join(hash_content))