Merge from 'master' to 'sycl-web' (#4)

CONFLICT (content): Merge conflict in clang/test/Driver/clang-offload-bundler.c
triSYCL · Oct 5, 2020 · dcd1f12 · dcd1f12
2 parents 4b9ab3e + dc6a0b0
commit dcd1f12
Show file tree

Hide file tree

Showing 338 changed files with 11,679 additions and 3,089 deletions.
diff --git a/clang-tools-extra/clang-tidy/readability/CMakeLists.txt b/clang-tools-extra/clang-tidy/readability/CMakeLists.txt
@@ -12,6 +12,7 @@ add_clang_library(clangTidyReadabilityModule
   DeleteNullPointerCheck.cpp
   DeletedDefaultCheck.cpp
   ElseAfterReturnCheck.cpp
+  FunctionCognitiveComplexityCheck.cpp
   FunctionSizeCheck.cpp
   IdentifierNamingCheck.cpp
   ImplicitBoolConversionCheck.cpp