diff --git a/debian/patches/23-strlcpy_strlcat_warning_removed.diff b/debian/patches/23-strlcpy_strlcat_warning_removed.diff index b7629ec1..60a27fa8 100644 --- a/debian/patches/23-strlcpy_strlcat_warning_removed.diff +++ b/debian/patches/23-strlcpy_strlcat_warning_removed.diff @@ -7,10 +7,10 @@ clang/test/Sema/warn-strlcpycat-size.c | 55 -------------- 6 files changed, 25 insertions(+), 78 deletions(-) -Index: llvm-toolchain-snapshot_14~++20220118052528+0d51b6ab1587/clang/include/clang/Basic/Builtins.def +Index: llvm-toolchain-snapshot_15~++20220204111954+78205faf54d3/clang/include/clang/Basic/Builtins.def =================================================================== ---- llvm-toolchain-snapshot_14~++20220118052528+0d51b6ab1587.orig/clang/include/clang/Basic/Builtins.def -+++ llvm-toolchain-snapshot_14~++20220118052528+0d51b6ab1587/clang/include/clang/Basic/Builtins.def +--- llvm-toolchain-snapshot_15~++20220204111954+78205faf54d3.orig/clang/include/clang/Basic/Builtins.def ++++ llvm-toolchain-snapshot_15~++20220204111954+78205faf54d3/clang/include/clang/Basic/Builtins.def @@ -616,8 +616,8 @@ BUILTIN(__builtin___memset_chk, "v*v*izz BUILTIN(__builtin___stpcpy_chk, "c*c*cC*z", "nF") BUILTIN(__builtin___strcat_chk, "c*c*cC*z", "nF") @@ -33,11 +33,11 @@ Index: llvm-toolchain-snapshot_14~++20220118052528+0d51b6ab1587/clang/include/cl // id objc_msgSend(id, SEL, ...) LIBBUILTIN(objc_msgSend, "GGH.", "f", "objc/message.h", OBJC_LANG) // long double objc_msgSend_fpret(id self, SEL op, ...) -Index: llvm-toolchain-snapshot_14~++20220118052528+0d51b6ab1587/clang/lib/AST/Decl.cpp +Index: llvm-toolchain-snapshot_15~++20220204111954+78205faf54d3/clang/lib/AST/Decl.cpp =================================================================== ---- llvm-toolchain-snapshot_14~++20220118052528+0d51b6ab1587.orig/clang/lib/AST/Decl.cpp -+++ llvm-toolchain-snapshot_14~++20220118052528+0d51b6ab1587/clang/lib/AST/Decl.cpp -@@ -4066,13 +4066,13 @@ unsigned FunctionDecl::getMemoryFunction +--- llvm-toolchain-snapshot_15~++20220204111954+78205faf54d3.orig/clang/lib/AST/Decl.cpp ++++ llvm-toolchain-snapshot_15~++20220204111954+78205faf54d3/clang/lib/AST/Decl.cpp +@@ -4064,13 +4064,13 @@ unsigned FunctionDecl::getMemoryFunction case Builtin::BImemmove: return Builtin::BImemmove; @@ -57,11 +57,11 @@ Index: llvm-toolchain-snapshot_14~++20220118052528+0d51b6ab1587/clang/lib/AST/De case Builtin::BI__builtin_memcmp: case Builtin::BImemcmp: -Index: llvm-toolchain-snapshot_14~++20220118052528+0d51b6ab1587/clang/lib/Sema/SemaChecking.cpp +Index: llvm-toolchain-snapshot_15~++20220204111954+78205faf54d3/clang/lib/Sema/SemaChecking.cpp =================================================================== ---- llvm-toolchain-snapshot_14~++20220118052528+0d51b6ab1587.orig/clang/lib/Sema/SemaChecking.cpp -+++ llvm-toolchain-snapshot_14~++20220118052528+0d51b6ab1587/clang/lib/Sema/SemaChecking.cpp -@@ -898,8 +898,8 @@ void Sema::checkFortifiedBuiltinMemoryFu +--- llvm-toolchain-snapshot_15~++20220204111954+78205faf54d3.orig/clang/lib/Sema/SemaChecking.cpp ++++ llvm-toolchain-snapshot_15~++20220204111954+78205faf54d3/clang/lib/Sema/SemaChecking.cpp +@@ -899,8 +899,8 @@ void Sema::checkFortifiedBuiltinMemoryFu case Builtin::BI__builtin___memcpy_chk: case Builtin::BI__builtin___memmove_chk: case Builtin::BI__builtin___memset_chk: @@ -72,7 +72,7 @@ Index: llvm-toolchain-snapshot_14~++20220118052528+0d51b6ab1587/clang/lib/Sema/S case Builtin::BI__builtin___strncat_chk: case Builtin::BI__builtin___strncpy_chk: case Builtin::BI__builtin___stpncpy_chk: -@@ -5406,10 +5406,10 @@ bool Sema::CheckFunctionCall(FunctionDec +@@ -5423,10 +5423,10 @@ bool Sema::CheckFunctionCall(FunctionDec switch (CMId) { case 0: return false; @@ -85,10 +85,10 @@ Index: llvm-toolchain-snapshot_14~++20220118052528+0d51b6ab1587/clang/lib/Sema/S case Builtin::BIstrncat: CheckStrncatArguments(TheCall, FnInfo); break; -Index: llvm-toolchain-snapshot_14~++20220118052528+0d51b6ab1587/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +Index: llvm-toolchain-snapshot_15~++20220204111954+78205faf54d3/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp =================================================================== ---- llvm-toolchain-snapshot_14~++20220118052528+0d51b6ab1587.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp -+++ llvm-toolchain-snapshot_14~++20220118052528+0d51b6ab1587/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +--- llvm-toolchain-snapshot_15~++20220204111954+78205faf54d3.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp ++++ llvm-toolchain-snapshot_15~++20220204111954+78205faf54d3/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp @@ -569,10 +569,10 @@ void GenericTaintChecker::initTaintRules {{"toupper"}, TR::Prop({{0}}, {{ReturnValueIndex}})}, {{CDF_MaybeBuiltin, {BI.getName(Builtin::BIstrncat)}}, @@ -102,11 +102,11 @@ Index: llvm-toolchain-snapshot_14~++20220118052528+0d51b6ab1587/clang/lib/Static {{CDF_MaybeBuiltin, {"snprintf"}}, TR::Prop({{1}, 3}, {{0, ReturnValueIndex}})}, {{CDF_MaybeBuiltin, {"sprintf"}}, -Index: llvm-toolchain-snapshot_14~++20220118052528+0d51b6ab1587/clang/test/Sema/builtins.c +Index: llvm-toolchain-snapshot_15~++20220204111954+78205faf54d3/clang/test/Sema/builtins.c =================================================================== ---- llvm-toolchain-snapshot_14~++20220118052528+0d51b6ab1587.orig/clang/test/Sema/builtins.c -+++ llvm-toolchain-snapshot_14~++20220118052528+0d51b6ab1587/clang/test/Sema/builtins.c -@@ -199,11 +199,9 @@ void test18() { +--- llvm-toolchain-snapshot_15~++20220204111954+78205faf54d3.orig/clang/test/Sema/builtins.c ++++ llvm-toolchain-snapshot_15~++20220204111954+78205faf54d3/clang/test/Sema/builtins.c +@@ -199,11 +199,9 @@ void test18(void) { ptr = __builtin___memccpy_chk(dst, src, '\037', sizeof(src), sizeof(dst)); result = __builtin___strlcpy_chk(dst, src, sizeof(dst), sizeof(dst)); @@ -117,8 +117,8 @@ Index: llvm-toolchain-snapshot_14~++20220118052528+0d51b6ab1587/clang/test/Sema/ - ptr = __builtin___strlcat_chk(dst, src, sizeof(dst), sizeof(dst)); // expected-warning {{incompatible integer to pointer conversion}} } - void no_ms_builtins() { -@@ -217,29 +215,6 @@ void unavailable() { + void no_ms_builtins(void) { +@@ -217,29 +215,6 @@ void unavailable(void) { __builtin_operator_delete(0); // expected-error {{'__builtin_operator_delete' is only available in C++}} } @@ -148,9 +148,9 @@ Index: llvm-toolchain-snapshot_14~++20220118052528+0d51b6ab1587/clang/test/Sema/ // rdar://11076881 char * Test20(char *p, const char *in, unsigned n) { -Index: llvm-toolchain-snapshot_14~++20220118052528+0d51b6ab1587/clang/test/Sema/warn-strlcpycat-size.c +Index: llvm-toolchain-snapshot_15~++20220204111954+78205faf54d3/clang/test/Sema/warn-strlcpycat-size.c =================================================================== ---- llvm-toolchain-snapshot_14~++20220118052528+0d51b6ab1587.orig/clang/test/Sema/warn-strlcpycat-size.c +--- llvm-toolchain-snapshot_15~++20220204111954+78205faf54d3.orig/clang/test/Sema/warn-strlcpycat-size.c +++ /dev/null @@ -1,55 +0,0 @@ -// RUN: %clang_cc1 -Wstrlcpy-strlcat-size -verify -fsyntax-only %s