rebase of the patch

This commit is contained in:
Sylvestre Ledru 2024-03-04 21:33:23 +01:00
parent a20cfdad53
commit 7fcd59bdf3

View File

@ -7,10 +7,10 @@
clang/test/Sema/warn-strlcpycat-size.c | 55 -------------- clang/test/Sema/warn-strlcpycat-size.c | 55 --------------
6 files changed, 25 insertions(+), 78 deletions(-) 6 files changed, 25 insertions(+), 78 deletions(-)
Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/AST/Decl.cpp Index: llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/lib/AST/Decl.cpp
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/AST/Decl.cpp --- llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69.orig/clang/lib/AST/Decl.cpp
+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/AST/Decl.cpp +++ llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/lib/AST/Decl.cpp
@@ -4381,13 +4381,13 @@ unsigned FunctionDecl::getMemoryFunction @@ -4381,13 +4381,13 @@ unsigned FunctionDecl::getMemoryFunction
case Builtin::BImemmove: case Builtin::BImemmove:
return Builtin::BImemmove; return Builtin::BImemmove;
@ -31,10 +31,10 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/AST/De
case Builtin::BI__builtin_memcmp: case Builtin::BI__builtin_memcmp:
case Builtin::BImemcmp: case Builtin::BImemcmp:
Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Sema/SemaChecking.cpp Index: llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/lib/Sema/SemaChecking.cpp
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/Sema/SemaChecking.cpp --- llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69.orig/clang/lib/Sema/SemaChecking.cpp
+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Sema/SemaChecking.cpp +++ llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/lib/Sema/SemaChecking.cpp
@@ -1319,8 +1319,8 @@ void Sema::checkFortifiedBuiltinMemoryFu @@ -1319,8 +1319,8 @@ void Sema::checkFortifiedBuiltinMemoryFu
case Builtin::BI__builtin___memcpy_chk: case Builtin::BI__builtin___memcpy_chk:
case Builtin::BI__builtin___memmove_chk: case Builtin::BI__builtin___memmove_chk:
@ -46,7 +46,7 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Sema/S
case Builtin::BI__builtin___strncat_chk: case Builtin::BI__builtin___strncat_chk:
case Builtin::BI__builtin___strncpy_chk: case Builtin::BI__builtin___strncpy_chk:
case Builtin::BI__builtin___stpncpy_chk: case Builtin::BI__builtin___stpncpy_chk:
@@ -7660,10 +7660,10 @@ bool Sema::CheckFunctionCall(FunctionDec @@ -7804,10 +7804,10 @@ bool Sema::CheckFunctionCall(FunctionDec
switch (CMId) { switch (CMId) {
case 0: case 0:
return false; return false;
@ -59,27 +59,27 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Sema/S
case Builtin::BIstrncat: case Builtin::BIstrncat:
CheckStrncatArguments(TheCall, FnInfo); CheckStrncatArguments(TheCall, FnInfo);
break; break;
Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp Index: llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp --- llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +++ llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
@@ -720,10 +720,10 @@ void GenericTaintChecker::initTaintRules @@ -720,10 +720,10 @@ void GenericTaintChecker::initTaintRules
{{CDF_MaybeBuiltin, {BI.getName(Builtin::BIstrncat)}}, {{CDM::CLibrary, {BI.getName(Builtin::BIstrncat)}},
TR::Prop({{1, 2}}, {{0, ReturnValueIndex}})}, TR::Prop({{1, 2}}, {{0, ReturnValueIndex}})},
- {{CDF_MaybeBuiltin, {BI.getName(Builtin::BIstrlcpy)}}, - {{CDM::CLibrary, {BI.getName(Builtin::BIstrlcpy)}},
+/* {{CDF_MaybeBuiltin, {BI.getName(Builtin::BIstrlcpy)}}, +/* {{CDM::CLibrary, {BI.getName(Builtin::BIstrlcpy)}},
TR::Prop({{1, 2}}, {{0}})}, TR::Prop({{1, 2}}, {{0}})},
{{CDF_MaybeBuiltin, {BI.getName(Builtin::BIstrlcat)}}, {{CDM::CLibrary, {BI.getName(Builtin::BIstrlcat)}},
- TR::Prop({{1, 2}}, {{0}})}, - TR::Prop({{1, 2}}, {{0}})},
+ TR::Prop({{1, 2}}, {{0}})},*/ + TR::Prop({{1, 2}}, {{0}})},*/
{{CDF_MaybeBuiltin, {{"snprintf"}}}, {{CDM::CLibrary, {{"snprintf"}}},
TR::Prop({{1}, 3}, {{0, ReturnValueIndex}})}, TR::Prop({{1}, 3}, {{0, ReturnValueIndex}})},
{{CDF_MaybeBuiltin, {{"sprintf"}}}, {{CDM::CLibrary, {{"sprintf"}}},
Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/test/Sema/builtins.c Index: llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/test/Sema/builtins.c
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/test/Sema/builtins.c --- llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69.orig/clang/test/Sema/builtins.c
+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/test/Sema/builtins.c +++ llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/test/Sema/builtins.c
@@ -195,12 +195,10 @@ void test18(void) { @@ -195,12 +195,10 @@ void test18(void) {
void *ptr; void *ptr;
@ -111,10 +111,10 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/test/Sema/
char * Test20(char *p, const char *in, unsigned n) char * Test20(char *p, const char *in, unsigned n)
{ {
Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/test/Sema/warn-strlcpycat-size.c Index: llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/test/Sema/warn-strlcpycat-size.c
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/test/Sema/warn-strlcpycat-size.c --- llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69.orig/clang/test/Sema/warn-strlcpycat-size.c
+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/test/Sema/warn-strlcpycat-size.c +++ llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/test/Sema/warn-strlcpycat-size.c
@@ -1,55 +0,0 @@ @@ -1,55 +0,0 @@
-// RUN: %clang_cc1 -Wstrlcpy-strlcat-size -verify -fsyntax-only %s -// RUN: %clang_cc1 -Wstrlcpy-strlcat-size -verify -fsyntax-only %s
- -
@ -171,11 +171,11 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/test/Sema/
- -
- strlcpy(z, str, sizeof(str)); // expected-warning {{size argument in 'strlcpy' call appears to be size of the source; expected the size of the destination}} expected-note {{change size argument to be the size of the destination}} - strlcpy(z, str, sizeof(str)); // expected-warning {{size argument in 'strlcpy' call appears to be size of the source; expected the size of the destination}} expected-note {{change size argument to be the size of the destination}}
-} -}
Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/include/clang/Basic/Builtins.td Index: llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/include/clang/Basic/Builtins.td
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/include/clang/Basic/Builtins.td --- llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69.orig/clang/include/clang/Basic/Builtins.td
+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/include/clang/Basic/Builtins.td +++ llvm-toolchain-snapshot_19~++20240304092954+72cf95df2f69/clang/include/clang/Basic/Builtins.td
@@ -3225,7 +3225,8 @@ def SigLongJmp : GNULibBuiltin<"setjmp.h @@ -3231,7 +3231,8 @@ def SigLongJmp : GNULibBuiltin<"setjmp.h
// non-standard but very common // non-standard but very common
@ -185,7 +185,7 @@ Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/include/cl
let Spellings = ["strlcpy"]; let Spellings = ["strlcpy"];
let Prototype = "size_t(char*, char const*, size_t)"; let Prototype = "size_t(char*, char const*, size_t)";
} }
@@ -3234,6 +3235,7 @@ def StrlCat : GNULibBuiltin<"string.h"> @@ -3240,6 +3241,7 @@ def StrlCat : GNULibBuiltin<"string.h">
let Spellings = ["strlcat"]; let Spellings = ["strlcat"];
let Prototype = "size_t(char*, char const*, size_t)"; let Prototype = "size_t(char*, char const*, size_t)";
} }