rebase of the patch

This commit is contained in:
Sylvestre Ledru 2023-07-07 17:52:02 +02:00
parent 7002023066
commit 4c5a5bb0af

View File

@ -7,11 +7,11 @@
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_16~++20230123091551+c3737a652230/clang/include/clang/Basic/Builtins.def Index: llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/include/clang/Basic/Builtins.def
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_16~++20230123091551+c3737a652230.orig/clang/include/clang/Basic/Builtins.def --- llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3.orig/clang/include/clang/Basic/Builtins.def
+++ llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/include/clang/Basic/Builtins.def +++ llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/include/clang/Basic/Builtins.def
@@ -626,8 +626,8 @@ BUILTIN(__builtin___memset_chk, "v*v*izz @@ -645,8 +645,8 @@ BUILTIN(__builtin___memset_chk, "v*v*izz
BUILTIN(__builtin___stpcpy_chk, "c*c*cC*z", "nF") BUILTIN(__builtin___stpcpy_chk, "c*c*cC*z", "nF")
BUILTIN(__builtin___strcat_chk, "c*c*cC*z", "nF") BUILTIN(__builtin___strcat_chk, "c*c*cC*z", "nF")
BUILTIN(__builtin___strcpy_chk, "c*c*cC*z", "nF") BUILTIN(__builtin___strcpy_chk, "c*c*cC*z", "nF")
@ -22,7 +22,7 @@ Index: llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/include/cl
BUILTIN(__builtin___strncat_chk, "c*c*cC*zz", "nF") BUILTIN(__builtin___strncat_chk, "c*c*cC*zz", "nF")
BUILTIN(__builtin___strncpy_chk, "c*c*cC*zz", "nF") BUILTIN(__builtin___strncpy_chk, "c*c*cC*zz", "nF")
BUILTIN(__builtin___stpncpy_chk, "c*c*cC*zz", "nF") BUILTIN(__builtin___stpncpy_chk, "c*c*cC*zz", "nF")
@@ -1149,8 +1149,8 @@ LIBBUILTIN(getcontext, "iK*", "fjT", @@ -1179,8 +1179,8 @@ LIBBUILTIN(getcontext, "iK*", "fjT",
LIBBUILTIN(_longjmp, "vJi", "frT", SETJMP_H, ALL_GNU_LANGUAGES) LIBBUILTIN(_longjmp, "vJi", "frT", SETJMP_H, ALL_GNU_LANGUAGES)
LIBBUILTIN(siglongjmp, "vSJi", "frT", SETJMP_H, ALL_GNU_LANGUAGES) LIBBUILTIN(siglongjmp, "vSJi", "frT", SETJMP_H, ALL_GNU_LANGUAGES)
// non-standard but very common // non-standard but very common
@ -33,11 +33,11 @@ Index: llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/include/cl
// id objc_msgSend(id, SEL, ...) // id objc_msgSend(id, SEL, ...)
LIBBUILTIN(objc_msgSend, "GGH.", "f", OBJC_MESSAGE_H, OBJC_LANG) LIBBUILTIN(objc_msgSend, "GGH.", "f", OBJC_MESSAGE_H, OBJC_LANG)
// long double objc_msgSend_fpret(id self, SEL op, ...) // long double objc_msgSend_fpret(id self, SEL op, ...)
Index: llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/lib/AST/Decl.cpp Index: llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/lib/AST/Decl.cpp
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_16~++20230123091551+c3737a652230.orig/clang/lib/AST/Decl.cpp --- llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3.orig/clang/lib/AST/Decl.cpp
+++ llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/lib/AST/Decl.cpp +++ llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/lib/AST/Decl.cpp
@@ -4175,13 +4175,13 @@ unsigned FunctionDecl::getMemoryFunction @@ -4276,13 +4276,13 @@ unsigned FunctionDecl::getMemoryFunction
case Builtin::BImemmove: case Builtin::BImemmove:
return Builtin::BImemmove; return Builtin::BImemmove;
@ -57,11 +57,11 @@ Index: llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/lib/AST/De
case Builtin::BI__builtin_memcmp: case Builtin::BI__builtin_memcmp:
case Builtin::BImemcmp: case Builtin::BImemcmp:
Index: llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/lib/Sema/SemaChecking.cpp Index: llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/lib/Sema/SemaChecking.cpp
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_16~++20230123091551+c3737a652230.orig/clang/lib/Sema/SemaChecking.cpp --- llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3.orig/clang/lib/Sema/SemaChecking.cpp
+++ llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/lib/Sema/SemaChecking.cpp +++ llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/lib/Sema/SemaChecking.cpp
@@ -1264,8 +1264,8 @@ void Sema::checkFortifiedBuiltinMemoryFu @@ -1265,8 +1265,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:
case Builtin::BI__builtin___memset_chk: case Builtin::BI__builtin___memset_chk:
@ -72,7 +72,7 @@ Index: llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/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:
@@ -6087,10 +6087,10 @@ bool Sema::CheckFunctionCall(FunctionDec @@ -6382,10 +6382,10 @@ bool Sema::CheckFunctionCall(FunctionDec
switch (CMId) { switch (CMId) {
case 0: case 0:
return false; return false;
@ -85,11 +85,11 @@ Index: llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/lib/Sema/S
case Builtin::BIstrncat: case Builtin::BIstrncat:
CheckStrncatArguments(TheCall, FnInfo); CheckStrncatArguments(TheCall, FnInfo);
break; break;
Index: llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp Index: llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_16~++20230123091551+c3737a652230.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp --- llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
+++ llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +++ llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
@@ -652,10 +652,10 @@ void GenericTaintChecker::initTaintRules @@ -717,10 +717,10 @@ void GenericTaintChecker::initTaintRules
{{CDF_MaybeBuiltin, {BI.getName(Builtin::BIstrncat)}}, {{CDF_MaybeBuiltin, {BI.getName(Builtin::BIstrncat)}},
TR::Prop({{1, 2}}, {{0, ReturnValueIndex}})}, TR::Prop({{1, 2}}, {{0, ReturnValueIndex}})},
@ -102,11 +102,11 @@ Index: llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/lib/Static
{{CDF_MaybeBuiltin, {{"snprintf"}}}, {{CDF_MaybeBuiltin, {{"snprintf"}}},
TR::Prop({{1}, 3}, {{0, ReturnValueIndex}})}, TR::Prop({{1}, 3}, {{0, ReturnValueIndex}})},
{{CDF_MaybeBuiltin, {{"sprintf"}}}, {{CDF_MaybeBuiltin, {{"sprintf"}}},
Index: llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/test/Sema/builtins.c Index: llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/test/Sema/builtins.c
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_16~++20230123091551+c3737a652230.orig/clang/test/Sema/builtins.c --- llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3.orig/clang/test/Sema/builtins.c
+++ llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/test/Sema/builtins.c +++ llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/test/Sema/builtins.c
@@ -197,12 +197,10 @@ void test18(void) { @@ -194,12 +194,10 @@ void test18(void) {
void *ptr; void *ptr;
ptr = __builtin___memccpy_chk(dst, src, '\037', sizeof(src), sizeof(dst)); ptr = __builtin___memccpy_chk(dst, src, '\037', sizeof(src), sizeof(dst));
@ -119,26 +119,27 @@ Index: llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/test/Sema/
} }
void no_ms_builtins(void) { void no_ms_builtins(void) {
@@ -217,6 +215,7 @@ void unavailable(void) { @@ -212,7 +210,7 @@ void unavailable(void) {
__builtin_operator_new(0); // expected-error {{'__builtin_operator_new' is only available in C++}}
__builtin_operator_delete(0); // expected-error {{'__builtin_operator_delete' is only available in C++}}
} }
-
// rdar://18259539
+/* +/*
size_t strlcpy(char * restrict dst, const char * restrict src, size_t size); size_t strlcpy(char * restrict dst, const char * restrict src, size_t size);
size_t strlcat(char * restrict dst, const char * restrict src, size_t size); size_t strlcat(char * restrict dst, const char * restrict src, size_t size);
@@ -238,6 +237,7 @@ void Test19(void) @@ -234,6 +232,7 @@ void Test19(void)
// expected-note {{change size argument to be the size of the destination}} \ // expected-note {{change size argument to be the size of the destination}} \
// expected-warning {{'strlcat' will always overflow; destination buffer has size 20, but size argument is 40}} // expected-warning {{'strlcat' will always overflow; destination buffer has size 20, but size argument is 40}}
} }
+*/ +*/
// rdar://11076881
char * Test20(char *p, const char *in, unsigned n) char * Test20(char *p, const char *in, unsigned n)
Index: llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/test/Sema/warn-strlcpycat-size.c {
Index: llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/test/Sema/warn-strlcpycat-size.c
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_16~++20230123091551+c3737a652230.orig/clang/test/Sema/warn-strlcpycat-size.c --- llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3.orig/clang/test/Sema/warn-strlcpycat-size.c
+++ llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/test/Sema/warn-strlcpycat-size.c +++ llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/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
- -