Fix scan-build setup

Makefile

@@ -52,8 +52,12 @@ appimage: appimage-setup build
 
 ### Scan build
 scan-build: run-configure
-	@make --directory=$(BUILD_DIR)/ext -j$(J)
-	@scan-build$(SCAN_BUILD_VERSION) -v -v -o $(SCAN_BUILD_REPORT_DIR) make --directory=build/src -j$(J)
+	@make --directory=build/ext -j$(J)
+	@scan-build$(SCAN_BUILD_VERSION) -v -v \
+		--use-analyzer=$(shell which clang$(SCAN_BUILD_VERSION)) \
+		--use-cc=$(shell which clang$(SCAN_BUILD_VERSION)) \
+		--use-c++=$(shell which clang++$(SCAN_BUILD_VERSION)) \
+		-o $(SCAN_BUILD_REPORT_DIR) make --directory=build/src -j$(J)
 
 clean:
 	@if [ -e $(BUILD_DIR)/Makefile ]; then make --directory=$(BUILD_DIR) clean; fi

configure.ac

@@ -1444,6 +1444,7 @@ if test "x$panda_WERROR" = xyes; then
    AX_CXXFLAGS_GCC_OPTION(-Wuse-after-free,, CXXFLAGS+=" -Wuse-after-free -Wno-error=use-after-free ",)
 
    AX_CHECK_COMPILE_FLAG("-Wpedantic", CXXFLAGS+=" -Wpedantic ",,"-Werror")
+   AX_CHECK_COMPILE_FLAG("-Wmismatched-tags", CXXFLAGS+=" -Wno-mismatched-tags ",,"-Werror")
    # AX_CHECK_COMPILE_FLAG("-Woverlength-strings", CXXFLAGS+=" -Wno-overlength-strings ",,"-Werror")
 else
    CXXFLAGS+=" -w "

src/HLS/simulation/c_initialization_yparser.ypp

@@ -70,6 +70,21 @@ REF_FORWARD_DECL(CInitializationLexer);
 #endif
 
 ///Skipping warnings due to bison
+#if defined(__clang__)
+#pragma clang diagnostic ignored "-Wconversion"
+#pragma clang diagnostic ignored "-Wsign-conversion"
+#pragma clang diagnostic ignored "-Wunused-parameter"
+#pragma clang diagnostic ignored "-Wwrite-strings"
+#pragma clang diagnostic ignored "-Wold-style-cast"
+#pragma clang diagnostic ignored "-Wredundant-decls"
+#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
+#if __has_warning("-Wunused-but-set-variable")
+#pragma clang diagnostic ignored "-Wunused-but-set-variable"
+#endif
+#if __has_warning("-Wzero-as-null-pointer-constant")
+#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
+#endif
+#else
 #pragma GCC diagnostic ignored "-Wconversion"
 #pragma GCC diagnostic ignored "-Wsign-conversion"
 #pragma GCC diagnostic ignored "-Wunused-parameter"
@@ -78,6 +93,8 @@ REF_FORWARD_DECL(CInitializationLexer);
 #pragma GCC diagnostic ignored "-Wredundant-decls"
 #pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
 #pragma GCC diagnostic ignored "-Wunused-but-set-variable"
+#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
+#endif
 
 /**
 * Class declarations

src/parser/aadl/aadl_yparser.ypp

@@ -77,14 +77,27 @@ REF_FORWARD_DECL(AadlFlexLexer);
 #include "aadl_lexer.hpp"
 
 ///Skipping warnings due to bison
+#if defined(__clang__)
+#pragma clang diagnostic ignored "-Wconversion"
+#pragma clang diagnostic ignored "-Wsign-conversion"
+#pragma clang diagnostic ignored "-Wunused-parameter"
+#pragma clang diagnostic ignored "-Wwrite-strings"
+#pragma clang diagnostic ignored "-Wold-style-cast"
+#pragma clang diagnostic ignored "-Wredundant-decls"
+#if __has_warning("-Wunused-but-set-variable")
+#pragma clang diagnostic ignored "-Wunused-but-set-variable"
+#endif
+#if __has_warning("-Wzero-as-null-pointer-constant")
+#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
+#endif
+#else
 #pragma GCC diagnostic ignored "-Wconversion"
 #pragma GCC diagnostic ignored "-Wsign-conversion"
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wwrite-strings"
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 #pragma GCC diagnostic ignored "-Wredundant-decls"
 #pragma GCC diagnostic ignored "-Wunused-but-set-variable"
-#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7) || (defined(__clang__) && __clang_major__ >= 6)
 #pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
 #endif
 /**

src/parser/asn/asn_yparser.ypp

@@ -77,14 +77,27 @@ REF_FORWARD_DECL(AsnFlexLexer);
 #include "asn_lexer.hpp"
 
 ///Skipping warnings due to bison
+#if defined(__clang__)
+#pragma clang diagnostic ignored "-Wconversion"
+#pragma clang diagnostic ignored "-Wsign-conversion"
+#pragma clang diagnostic ignored "-Wunused-parameter"
+#pragma clang diagnostic ignored "-Wwrite-strings"
+#pragma clang diagnostic ignored "-Wold-style-cast"
+#pragma clang diagnostic ignored "-Wredundant-decls"
+#if __has_warning("-Wunused-but-set-variable")
+#pragma clang diagnostic ignored "-Wunused-but-set-variable"
+#endif
+#if __has_warning("-Wzero-as-null-pointer-constant")
+#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
+#endif
+#else
 #pragma GCC diagnostic ignored "-Wconversion"
 #pragma GCC diagnostic ignored "-Wsign-conversion"
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wwrite-strings"
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 #pragma GCC diagnostic ignored "-Wredundant-decls"
 #pragma GCC diagnostic ignored "-Wunused-but-set-variable"
-#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7) || (defined(__clang__) && __clang_major__ >= 6)
 #pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
 #endif
 

src/parser/compiler/treeParser.ypp

@@ -103,14 +103,27 @@ REF_FORWARD_DECL(TreeFlexLexer);
 */
 //#define NDEBUG 1
 ///Skipping warnings due to bison
+#if defined(__clang__)
+#pragma clang diagnostic ignored "-Wconversion"
+#pragma clang diagnostic ignored "-Wsign-conversion"
+#pragma clang diagnostic ignored "-Wunused-parameter"
+#pragma clang diagnostic ignored "-Wwrite-strings"
+#pragma clang diagnostic ignored "-Wold-style-cast"
+#pragma clang diagnostic ignored "-Wredundant-decls"
+#if __has_warning("-Wunused-but-set-variable")
+#pragma clang diagnostic ignored "-Wunused-but-set-variable"
+#endif
+#if __has_warning("-Wzero-as-null-pointer-constant")
+#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
+#endif
+#else
 #pragma GCC diagnostic ignored "-Wconversion"
 #pragma GCC diagnostic ignored "-Wsign-conversion"
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wwrite-strings"
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 #pragma GCC diagnostic ignored "-Wredundant-decls"
 #pragma GCC diagnostic ignored "-Wunused-but-set-variable"
-#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7) || (defined(__clang__) && __clang_major__ >= 6)
 #pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
 #endif
 /**

src/parser/discrepancy/discrepancyParser.ypp

@@ -101,15 +101,27 @@ REF_FORWARD_DECL(Discrepancy);
 #include "string_manipulation.hpp"          // for STR
 
 // Skipping warnings due to bison
+#if defined(__clang__)
+#pragma clang diagnostic ignored "-Wconversion"
+#pragma clang diagnostic ignored "-Wsign-conversion"
+#pragma clang diagnostic ignored "-Wunused-parameter"
+#pragma clang diagnostic ignored "-Wwrite-strings"
+#pragma clang diagnostic ignored "-Wold-style-cast"
+#pragma clang diagnostic ignored "-Wredundant-decls"
+#if __has_warning("-Wunused-but-set-variable")
+#pragma clang diagnostic ignored "-Wunused-but-set-variable"
+#endif
+#if __has_warning("-Wzero-as-null-pointer-constant")
+#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
+#endif
+#else
 #pragma GCC diagnostic ignored "-Wconversion"
-#pragma GCC diagnostic ignored "-Wredundant-decls"
 #pragma GCC diagnostic ignored "-Wsign-conversion"
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wwrite-strings"
-#pragma GCC diagnostic ignored "-Wswitch-default"
 #pragma GCC diagnostic ignored "-Wold-style-cast"
+#pragma GCC diagnostic ignored "-Wredundant-decls"
 #pragma GCC diagnostic ignored "-Wunused-but-set-variable"
-#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)
 #pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
 #endif
 

src/parser/polixml/xmlParser.ypp

@@ -81,14 +81,27 @@ REF_FORWARD_DECL(xml_document);
 * Defines
 */
 ///Skipping warnings due to bison
+#if defined(__clang__)
+#pragma clang diagnostic ignored "-Wconversion"
+#pragma clang diagnostic ignored "-Wsign-conversion"
+#pragma clang diagnostic ignored "-Wunused-parameter"
+#pragma clang diagnostic ignored "-Wwrite-strings"
+#pragma clang diagnostic ignored "-Wold-style-cast"
+#pragma clang diagnostic ignored "-Wredundant-decls"
+#if __has_warning("-Wunused-but-set-variable")
+#pragma clang diagnostic ignored "-Wunused-but-set-variable"
+#endif
+#if __has_warning("-Wzero-as-null-pointer-constant")
+#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
+#endif
+#else
 #pragma GCC diagnostic ignored "-Wconversion"
 #pragma GCC diagnostic ignored "-Wsign-conversion"
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wwrite-strings"
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 #pragma GCC diagnostic ignored "-Wredundant-decls"
 #pragma GCC diagnostic ignored "-Wunused-but-set-variable"
-#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7) || (defined(__clang__) && __clang_major__ >= 6)
 #pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
 #endif
 /**

src/utility/custom_map.hpp

@@ -54,6 +54,10 @@
 #pragma clang diagnostic ignored "-Wdouble-promotion"
 #pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
 #pragma clang diagnostic ignored "-Wextra-semi"
+#pragma clang diagnostic ignored "-Wshadow"
+#if __has_warning("-Wdeprecated-builtins")
+#pragma clang diagnostic ignored "-Wdeprecated-builtins"
+#endif
 #else
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wsign-conversion"
@@ -63,12 +67,13 @@
 #pragma GCC diagnostic ignored "-Woverflow"
 #pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
 #pragma GCC diagnostic ignored "-Wstrict-overflow"
+#pragma GCC diagnostic ignored "-Wshadow"
 #endif
 
-#include "absl/container/btree_map.h"
-#include "absl/container/flat_hash_map.h"
-#include "absl/container/node_hash_map.h"
-#include "absl/hash/hash.h"
+#include <absl/container/btree_map.h>
+#include <absl/container/flat_hash_map.h>
+#include <absl/container/node_hash_map.h>
+#include <absl/hash/hash.h>
 
 #if defined(__clang__)
 #pragma clang diagnostic pop

src/utility/custom_set.hpp

@@ -56,6 +56,10 @@
 #pragma clang diagnostic ignored "-Wshorten-64-to-32"
 #pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
 #pragma clang diagnostic ignored "-Wextra-semi"
+#pragma clang diagnostic ignored "-Wshadow"
+#if __has_warning("-Wdeprecated-builtins")
+#pragma clang diagnostic ignored "-Wdeprecated-builtins"
+#endif
 #else
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wsign-conversion"
@@ -65,12 +69,13 @@
 #pragma GCC diagnostic ignored "-Woverflow"
 #pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
 #pragma GCC diagnostic ignored "-Wstrict-overflow"
+#pragma GCC diagnostic ignored "-Wshadow"
 #endif
 
-#include "absl/container/btree_set.h"
-#include "absl/container/flat_hash_set.h"
-#include "absl/container/node_hash_set.h"
-#include "absl/hash/hash.h"
+#include <absl/container/btree_set.h>
+#include <absl/container/flat_hash_set.h>
+#include <absl/container/node_hash_set.h>
+#include <absl/hash/hash.h>
 
 #if defined(__clang__)
 #pragma clang diagnostic pop

src/wrapper/compiler/compiler_wrapper.cpp

@@ -2331,7 +2331,6 @@ const std::string CompilerWrapper::AddSourceCodeIncludes(const std::list<std::st
 std::string CompilerWrapper::clang_recipes(const CompilerWrapper_OptimizationSet optimization_set,
                                            const std::string& fname) const
 {
-   const auto& compiler = GetCompiler();
    auto plugin_prefix = add_plugin_prefix(compiler_target);
 
    const auto opt_level = WriteOptimizationLevel(optimization_set == CompilerWrapper_OptimizationSet::O0 ?