From 3d813bd71af8bb59d623613259decd5ac393114e Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 27 Dec 2022 10:46:03 +0100 Subject: [PATCH] rebase of the patches --- .../23-strlcpy_strlcat_warning_removed.diff | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/debian/patches/23-strlcpy_strlcat_warning_removed.diff b/debian/patches/23-strlcpy_strlcat_warning_removed.diff index e37dfcc3..4c03d44d 100644 --- a/debian/patches/23-strlcpy_strlcat_warning_removed.diff +++ b/debian/patches/23-strlcpy_strlcat_warning_removed.diff @@ -7,11 +7,11 @@ clang/test/Sema/warn-strlcpycat-size.c | 55 -------------- 6 files changed, 25 insertions(+), 78 deletions(-) -Index: llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe/clang/include/clang/Basic/Builtins.def +Index: llvm-toolchain-snapshot_16~++20221227103413+d9ab3e82f30d/clang/include/clang/Basic/Builtins.def =================================================================== ---- llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe.orig/clang/include/clang/Basic/Builtins.def -+++ llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe/clang/include/clang/Basic/Builtins.def -@@ -624,8 +624,8 @@ BUILTIN(__builtin___memset_chk, "v*v*izz +--- llvm-toolchain-snapshot_16~++20221227103413+d9ab3e82f30d.orig/clang/include/clang/Basic/Builtins.def ++++ llvm-toolchain-snapshot_16~++20221227103413+d9ab3e82f30d/clang/include/clang/Basic/Builtins.def +@@ -626,8 +626,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") BUILTIN(__builtin___strcpy_chk, "c*c*cC*z", "nF") @@ -22,7 +22,7 @@ Index: llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe/clang/include/cl BUILTIN(__builtin___strncat_chk, "c*c*cC*zz", "nF") BUILTIN(__builtin___strncpy_chk, "c*c*cC*zz", "nF") BUILTIN(__builtin___stpncpy_chk, "c*c*cC*zz", "nF") -@@ -1143,8 +1143,8 @@ LIBBUILTIN(getcontext, "iK*", "fjT", +@@ -1149,8 +1149,8 @@ LIBBUILTIN(getcontext, "iK*", "fjT", LIBBUILTIN(_longjmp, "vJi", "frT", "setjmp.h", ALL_GNU_LANGUAGES) LIBBUILTIN(siglongjmp, "vSJi", "frT", "setjmp.h", ALL_GNU_LANGUAGES) // non-standard but very common @@ -33,11 +33,11 @@ Index: llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe/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_15~++20220723123759+d959324e1efe/clang/lib/AST/Decl.cpp +Index: llvm-toolchain-snapshot_16~++20221227103413+d9ab3e82f30d/clang/lib/AST/Decl.cpp =================================================================== ---- llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe.orig/clang/lib/AST/Decl.cpp -+++ llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe/clang/lib/AST/Decl.cpp -@@ -4139,13 +4139,13 @@ unsigned FunctionDecl::getMemoryFunction +--- llvm-toolchain-snapshot_16~++20221227103413+d9ab3e82f30d.orig/clang/lib/AST/Decl.cpp ++++ llvm-toolchain-snapshot_16~++20221227103413+d9ab3e82f30d/clang/lib/AST/Decl.cpp +@@ -4159,13 +4159,13 @@ unsigned FunctionDecl::getMemoryFunction case Builtin::BImemmove: return Builtin::BImemmove; @@ -57,11 +57,11 @@ Index: llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe/clang/lib/AST/De case Builtin::BI__builtin_memcmp: case Builtin::BImemcmp: -Index: llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe/clang/lib/Sema/SemaChecking.cpp +Index: llvm-toolchain-snapshot_16~++20221227103413+d9ab3e82f30d/clang/lib/Sema/SemaChecking.cpp =================================================================== ---- llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe.orig/clang/lib/Sema/SemaChecking.cpp -+++ llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe/clang/lib/Sema/SemaChecking.cpp -@@ -1223,8 +1223,8 @@ void Sema::checkFortifiedBuiltinMemoryFu +--- llvm-toolchain-snapshot_16~++20221227103413+d9ab3e82f30d.orig/clang/lib/Sema/SemaChecking.cpp ++++ llvm-toolchain-snapshot_16~++20221227103413+d9ab3e82f30d/clang/lib/Sema/SemaChecking.cpp +@@ -1261,8 +1261,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_15~++20220723123759+d959324e1efe/clang/lib/Sema/S case Builtin::BI__builtin___strncat_chk: case Builtin::BI__builtin___strncpy_chk: case Builtin::BI__builtin___stpncpy_chk: -@@ -5890,10 +5890,10 @@ bool Sema::CheckFunctionCall(FunctionDec +@@ -6006,10 +6006,10 @@ bool Sema::CheckFunctionCall(FunctionDec switch (CMId) { case 0: return false; @@ -85,11 +85,11 @@ Index: llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe/clang/lib/Sema/S case Builtin::BIstrncat: CheckStrncatArguments(TheCall, FnInfo); break; -Index: llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +Index: llvm-toolchain-snapshot_16~++20221227103413+d9ab3e82f30d/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp =================================================================== ---- llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp -+++ llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp -@@ -652,10 +652,10 @@ void GenericTaintChecker::initTaintRules +--- llvm-toolchain-snapshot_16~++20221227103413+d9ab3e82f30d.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp ++++ llvm-toolchain-snapshot_16~++20221227103413+d9ab3e82f30d/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +@@ -651,10 +651,10 @@ void GenericTaintChecker::initTaintRules {{CDF_MaybeBuiltin, {BI.getName(Builtin::BIstrncat)}}, TR::Prop({{1, 2}}, {{0, ReturnValueIndex}})}, @@ -99,13 +99,13 @@ Index: llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe/clang/lib/Static {{CDF_MaybeBuiltin, {BI.getName(Builtin::BIstrlcat)}}, - TR::Prop({{1, 2}}, {{0}})}, + TR::Prop({{1, 2}}, {{0}})},*/ - {{CDF_MaybeBuiltin, {"snprintf"}}, + {{CDF_MaybeBuiltin, {{"snprintf"}}}, TR::Prop({{1}, 3}, {{0, ReturnValueIndex}})}, - {{CDF_MaybeBuiltin, {"sprintf"}}, -Index: llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe/clang/test/Sema/builtins.c + {{CDF_MaybeBuiltin, {{"sprintf"}}}, +Index: llvm-toolchain-snapshot_16~++20221227103413+d9ab3e82f30d/clang/test/Sema/builtins.c =================================================================== ---- llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe.orig/clang/test/Sema/builtins.c -+++ llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe/clang/test/Sema/builtins.c +--- llvm-toolchain-snapshot_16~++20221227103413+d9ab3e82f30d.orig/clang/test/Sema/builtins.c ++++ llvm-toolchain-snapshot_16~++20221227103413+d9ab3e82f30d/clang/test/Sema/builtins.c @@ -197,12 +197,10 @@ void test18(void) { void *ptr; @@ -135,10 +135,10 @@ Index: llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe/clang/test/Sema/ // rdar://11076881 char * Test20(char *p, const char *in, unsigned n) -Index: llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe/clang/test/Sema/warn-strlcpycat-size.c +Index: llvm-toolchain-snapshot_16~++20221227103413+d9ab3e82f30d/clang/test/Sema/warn-strlcpycat-size.c =================================================================== ---- llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe.orig/clang/test/Sema/warn-strlcpycat-size.c -+++ llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe/clang/test/Sema/warn-strlcpycat-size.c +--- llvm-toolchain-snapshot_16~++20221227103413+d9ab3e82f30d.orig/clang/test/Sema/warn-strlcpycat-size.c ++++ llvm-toolchain-snapshot_16~++20221227103413+d9ab3e82f30d/clang/test/Sema/warn-strlcpycat-size.c @@ -1,55 +0,0 @@ -// RUN: %clang_cc1 -Wstrlcpy-strlcat-size -verify -fsyntax-only %s -