mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-07-27 06:31:27 +00:00
rebase of the patches
This commit is contained in:
parent
d3ec781b40
commit
24222f0013
@ -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_17~++20230718090722+aa9a10ac1dde/clang/include/clang/Basic/Builtins.def
|
Index: llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/include/clang/Basic/Builtins.def
|
||||||
===================================================================
|
===================================================================
|
||||||
--- llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde.orig/clang/include/clang/Basic/Builtins.def
|
--- llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f.orig/clang/include/clang/Basic/Builtins.def
|
||||||
+++ llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/include/clang/Basic/Builtins.def
|
+++ llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/include/clang/Basic/Builtins.def
|
||||||
@@ -645,8 +645,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")
|
||||||
@ -22,7 +22,7 @@ Index: llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/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")
|
||||||
@@ -1179,8 +1179,8 @@ LIBBUILTIN(getcontext, "iK*", "fjT",
|
@@ -1182,8 +1182,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_17~++20230718090722+aa9a10ac1dde/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_17~++20230718090722+aa9a10ac1dde/clang/lib/AST/Decl.cpp
|
Index: llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/lib/AST/Decl.cpp
|
||||||
===================================================================
|
===================================================================
|
||||||
--- llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde.orig/clang/lib/AST/Decl.cpp
|
--- llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f.orig/clang/lib/AST/Decl.cpp
|
||||||
+++ llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/lib/AST/Decl.cpp
|
+++ llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/lib/AST/Decl.cpp
|
||||||
@@ -4274,13 +4274,13 @@ unsigned FunctionDecl::getMemoryFunction
|
@@ -4310,13 +4310,13 @@ unsigned FunctionDecl::getMemoryFunction
|
||||||
case Builtin::BImemmove:
|
case Builtin::BImemmove:
|
||||||
return Builtin::BImemmove;
|
return Builtin::BImemmove;
|
||||||
|
|
||||||
@ -57,11 +57,11 @@ Index: llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/lib/AST/De
|
|||||||
|
|
||||||
case Builtin::BI__builtin_memcmp:
|
case Builtin::BI__builtin_memcmp:
|
||||||
case Builtin::BImemcmp:
|
case Builtin::BImemcmp:
|
||||||
Index: llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/lib/Sema/SemaChecking.cpp
|
Index: llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/lib/Sema/SemaChecking.cpp
|
||||||
===================================================================
|
===================================================================
|
||||||
--- llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde.orig/clang/lib/Sema/SemaChecking.cpp
|
--- llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f.orig/clang/lib/Sema/SemaChecking.cpp
|
||||||
+++ llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/lib/Sema/SemaChecking.cpp
|
+++ llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/lib/Sema/SemaChecking.cpp
|
||||||
@@ -1265,8 +1265,8 @@ void Sema::checkFortifiedBuiltinMemoryFu
|
@@ -1263,8 +1263,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_17~++20230718090722+aa9a10ac1dde/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:
|
||||||
@@ -6744,10 +6744,10 @@ bool Sema::CheckFunctionCall(FunctionDec
|
@@ -6964,10 +6964,10 @@ bool Sema::CheckFunctionCall(FunctionDec
|
||||||
switch (CMId) {
|
switch (CMId) {
|
||||||
case 0:
|
case 0:
|
||||||
return false;
|
return false;
|
||||||
@ -85,10 +85,10 @@ Index: llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/lib/Sema/S
|
|||||||
case Builtin::BIstrncat:
|
case Builtin::BIstrncat:
|
||||||
CheckStrncatArguments(TheCall, FnInfo);
|
CheckStrncatArguments(TheCall, FnInfo);
|
||||||
break;
|
break;
|
||||||
Index: llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
|
Index: llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
|
||||||
===================================================================
|
===================================================================
|
||||||
--- llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
|
--- llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
|
||||||
+++ llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
|
+++ llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
|
||||||
@@ -717,10 +717,10 @@ void GenericTaintChecker::initTaintRules
|
@@ -717,10 +717,10 @@ void GenericTaintChecker::initTaintRules
|
||||||
|
|
||||||
{{CDF_MaybeBuiltin, {BI.getName(Builtin::BIstrncat)}},
|
{{CDF_MaybeBuiltin, {BI.getName(Builtin::BIstrncat)}},
|
||||||
@ -102,11 +102,11 @@ Index: llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/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_17~++20230718090722+aa9a10ac1dde/clang/test/Sema/builtins.c
|
Index: llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/test/Sema/builtins.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde.orig/clang/test/Sema/builtins.c
|
--- llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f.orig/clang/test/Sema/builtins.c
|
||||||
+++ llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/test/Sema/builtins.c
|
+++ llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/test/Sema/builtins.c
|
||||||
@@ -197,12 +197,10 @@ void test18(void) {
|
@@ -195,12 +195,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,28 @@ Index: llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/test/Sema/
|
|||||||
}
|
}
|
||||||
|
|
||||||
void no_ms_builtins(void) {
|
void no_ms_builtins(void) {
|
||||||
@@ -216,6 +214,7 @@ void unavailable(void) {
|
@@ -214,7 +212,8 @@ void unavailable(void) {
|
||||||
__builtin_operator_delete(0); // expected-error {{'__builtin_operator_delete' is only available in C++}}
|
__builtin_operator_delete(0); // expected-error {{'__builtin_operator_delete' is only available in C++}}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
-size_t strlcpy(char * restrict dst, const char * restrict src, size_t size);
|
||||||
+/*
|
+/*
|
||||||
// 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)
|
|
||||||
|
void Test19(void)
|
||||||
|
@@ -235,6 +234,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_17~++20230718090722+aa9a10ac1dde/clang/test/Sema/warn-strlcpycat-size.c
|
{
|
||||||
|
Index: llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/clang/test/Sema/warn-strlcpycat-size.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde.orig/clang/test/Sema/warn-strlcpycat-size.c
|
--- llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f.orig/clang/test/Sema/warn-strlcpycat-size.c
|
||||||
+++ llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/test/Sema/warn-strlcpycat-size.c
|
+++ llvm-toolchain-snapshot_18~++20230828063023+b4b42bd6522f/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
|
||||||
-
|
-
|
||||||
|
Loading…
Reference in New Issue
Block a user