rebase of the patch

This commit is contained in:
Sylvestre Ledru 2023-07-18 09:10:46 +02:00
parent a056f2d602
commit cabcb5a126

View File

@ -7,10 +7,10 @@
clang/test/Sema/warn-strlcpycat-size.c | 55 --------------
6 files changed, 25 insertions(+), 78 deletions(-)
Index: llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/include/clang/Basic/Builtins.def
Index: llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/include/clang/Basic/Builtins.def
===================================================================
--- llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3.orig/clang/include/clang/Basic/Builtins.def
+++ llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/include/clang/Basic/Builtins.def
--- llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde.orig/clang/include/clang/Basic/Builtins.def
+++ llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/include/clang/Basic/Builtins.def
@@ -645,8 +645,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_17~++20230707052836+1882a4ee69b3/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_17~++20230707052836+1882a4ee69b3/clang/lib/AST/Decl.cpp
Index: llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/lib/AST/Decl.cpp
===================================================================
--- llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3.orig/clang/lib/AST/Decl.cpp
+++ llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/lib/AST/Decl.cpp
@@ -4276,13 +4276,13 @@ unsigned FunctionDecl::getMemoryFunction
--- llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde.orig/clang/lib/AST/Decl.cpp
+++ llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/lib/AST/Decl.cpp
@@ -4274,13 +4274,13 @@ unsigned FunctionDecl::getMemoryFunction
case Builtin::BImemmove:
return Builtin::BImemmove;
@ -57,10 +57,10 @@ Index: llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/lib/AST/De
case Builtin::BI__builtin_memcmp:
case Builtin::BImemcmp:
Index: llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/lib/Sema/SemaChecking.cpp
Index: llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/lib/Sema/SemaChecking.cpp
===================================================================
--- llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3.orig/clang/lib/Sema/SemaChecking.cpp
+++ llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/lib/Sema/SemaChecking.cpp
--- llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde.orig/clang/lib/Sema/SemaChecking.cpp
+++ llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/lib/Sema/SemaChecking.cpp
@@ -1265,8 +1265,8 @@ void Sema::checkFortifiedBuiltinMemoryFu
case Builtin::BI__builtin___memcpy_chk:
case Builtin::BI__builtin___memmove_chk:
@ -72,7 +72,7 @@ Index: llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/lib/Sema/S
case Builtin::BI__builtin___strncat_chk:
case Builtin::BI__builtin___strncpy_chk:
case Builtin::BI__builtin___stpncpy_chk:
@@ -6382,10 +6382,10 @@ bool Sema::CheckFunctionCall(FunctionDec
@@ -6744,10 +6744,10 @@ bool Sema::CheckFunctionCall(FunctionDec
switch (CMId) {
case 0:
return false;
@ -85,10 +85,10 @@ Index: llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/lib/Sema/S
case Builtin::BIstrncat:
CheckStrncatArguments(TheCall, FnInfo);
break;
Index: llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
Index: llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
===================================================================
--- llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
+++ llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
--- llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
+++ llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
@@ -717,10 +717,10 @@ void GenericTaintChecker::initTaintRules
{{CDF_MaybeBuiltin, {BI.getName(Builtin::BIstrncat)}},
@ -102,11 +102,11 @@ Index: llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/lib/Static
{{CDF_MaybeBuiltin, {{"snprintf"}}},
TR::Prop({{1}, 3}, {{0, ReturnValueIndex}})},
{{CDF_MaybeBuiltin, {{"sprintf"}}},
Index: llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/test/Sema/builtins.c
Index: llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/test/Sema/builtins.c
===================================================================
--- llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3.orig/clang/test/Sema/builtins.c
+++ llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/test/Sema/builtins.c
@@ -194,12 +194,10 @@ void test18(void) {
--- llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde.orig/clang/test/Sema/builtins.c
+++ llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/test/Sema/builtins.c
@@ -197,12 +197,10 @@ void test18(void) {
void *ptr;
ptr = __builtin___memccpy_chk(dst, src, '\037', sizeof(src), sizeof(dst));
@ -119,27 +119,26 @@ Index: llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/test/Sema/
}
void no_ms_builtins(void) {
@@ -212,7 +210,7 @@ void unavailable(void) {
__builtin_operator_new(0); // expected-error {{'__builtin_operator_new' is only available in C++}}
@@ -216,6 +214,7 @@ void unavailable(void) {
__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 strlcat(char * restrict dst, const char * restrict src, size_t size);
@@ -234,6 +232,7 @@ void Test19(void)
@@ -238,6 +237,7 @@ void Test19(void)
// 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}}
}
+*/
// rdar://11076881
char * Test20(char *p, const char *in, unsigned n)
{
Index: llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/test/Sema/warn-strlcpycat-size.c
Index: llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/test/Sema/warn-strlcpycat-size.c
===================================================================
--- llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3.orig/clang/test/Sema/warn-strlcpycat-size.c
+++ llvm-toolchain-snapshot_17~++20230707052836+1882a4ee69b3/clang/test/Sema/warn-strlcpycat-size.c
--- llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde.orig/clang/test/Sema/warn-strlcpycat-size.c
+++ llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/test/Sema/warn-strlcpycat-size.c
@@ -1,55 +0,0 @@
-// RUN: %clang_cc1 -Wstrlcpy-strlcat-size -verify -fsyntax-only %s
-