rebase of the patch

This commit is contained in:
Sylvestre Ledru 2020-10-29 13:51:47 +01:00
parent 4e84f3b1fc
commit 7019ce193d

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_12~++20201001102642+456974ac78f/clang/include/clang/Basic/Builtins.def Index: llvm-toolchain-snapshot_12~++20201029014435+d6d6fdb068a/clang/include/clang/Basic/Builtins.def
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_12~++20201001102642+456974ac78f.orig/clang/include/clang/Basic/Builtins.def --- llvm-toolchain-snapshot_12~++20201029014435+d6d6fdb068a.orig/clang/include/clang/Basic/Builtins.def
+++ llvm-toolchain-snapshot_12~++20201001102642+456974ac78f/clang/include/clang/Basic/Builtins.def +++ llvm-toolchain-snapshot_12~++20201029014435+d6d6fdb068a/clang/include/clang/Basic/Builtins.def
@@ -557,8 +557,8 @@ BUILTIN(__builtin___memset_chk, "v*v*izz @@ -557,8 +557,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_12~++20201001102642+456974ac78f/clang/include/cla
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")
@@ -1037,8 +1037,8 @@ LIBBUILTIN(getcontext, "iK*", "fjT", @@ -1039,8 +1039,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_12~++20201001102642+456974ac78f/clang/include/cla
// 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_12~++20201001102642+456974ac78f/clang/lib/AST/Decl.cpp Index: llvm-toolchain-snapshot_12~++20201029014435+d6d6fdb068a/clang/lib/AST/Decl.cpp
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_12~++20201001102642+456974ac78f.orig/clang/lib/AST/Decl.cpp --- llvm-toolchain-snapshot_12~++20201029014435+d6d6fdb068a.orig/clang/lib/AST/Decl.cpp
+++ llvm-toolchain-snapshot_12~++20201001102642+456974ac78f/clang/lib/AST/Decl.cpp +++ llvm-toolchain-snapshot_12~++20201029014435+d6d6fdb068a/clang/lib/AST/Decl.cpp
@@ -3895,13 +3895,13 @@ unsigned FunctionDecl::getMemoryFunction @@ -3913,13 +3913,13 @@ unsigned FunctionDecl::getMemoryFunction
case Builtin::BImemmove: case Builtin::BImemmove:
return Builtin::BImemmove; return Builtin::BImemmove;
@ -57,10 +57,10 @@ Index: llvm-toolchain-snapshot_12~++20201001102642+456974ac78f/clang/lib/AST/Dec
case Builtin::BI__builtin_memcmp: case Builtin::BI__builtin_memcmp:
case Builtin::BImemcmp: case Builtin::BImemcmp:
Index: llvm-toolchain-snapshot_12~++20201001102642+456974ac78f/clang/lib/Sema/SemaChecking.cpp Index: llvm-toolchain-snapshot_12~++20201029014435+d6d6fdb068a/clang/lib/Sema/SemaChecking.cpp
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_12~++20201001102642+456974ac78f.orig/clang/lib/Sema/SemaChecking.cpp --- llvm-toolchain-snapshot_12~++20201029014435+d6d6fdb068a.orig/clang/lib/Sema/SemaChecking.cpp
+++ llvm-toolchain-snapshot_12~++20201001102642+456974ac78f/clang/lib/Sema/SemaChecking.cpp +++ llvm-toolchain-snapshot_12~++20201029014435+d6d6fdb068a/clang/lib/Sema/SemaChecking.cpp
@@ -654,8 +654,8 @@ void Sema::checkFortifiedBuiltinMemoryFu @@ -654,8 +654,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:
@ -72,24 +72,23 @@ Index: llvm-toolchain-snapshot_12~++20201001102642+456974ac78f/clang/lib/Sema/Se
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:
@@ -4507,9 +4507,10 @@ bool Sema::CheckFunctionCall(FunctionDec @@ -4501,10 +4501,10 @@ bool Sema::CheckFunctionCall(FunctionDec
switch (CMId) {
case 0:
return false; return false;
- case Builtin::BIstrlcpy: // fallthrough
// Handle memory setting and copying functions. +/* case Builtin::BIstrlcpy: // fallthrough
- if (CMId == Builtin::BIstrlcpy || CMId == Builtin::BIstrlcat) case Builtin::BIstrlcat:
- CheckStrlcpycatArguments(TheCall, FnInfo); CheckStrlcpycatArguments(TheCall, FnInfo);
- else if (CMId == Builtin::BIstrncat) - break;
+// if (CMId == Builtin::BIstrlcpy || CMId == Builtin::BIstrlcat) + break;*/
+// CheckStrlcpycatArguments(TheCall, FnInfo); case Builtin::BIstrncat:
+// else
+ if (CMId == Builtin::BIstrncat)
CheckStrncatArguments(TheCall, FnInfo); CheckStrncatArguments(TheCall, FnInfo);
else break;
CheckMemaccessArguments(TheCall, CMId, FnInfo); Index: llvm-toolchain-snapshot_12~++20201029014435+d6d6fdb068a/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
Index: llvm-toolchain-snapshot_12~++20201001102642+456974ac78f/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_12~++20201001102642+456974ac78f.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp --- llvm-toolchain-snapshot_12~++20201029014435+d6d6fdb068a.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
+++ llvm-toolchain-snapshot_12~++20201001102642+456974ac78f/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +++ llvm-toolchain-snapshot_12~++20201029014435+d6d6fdb068a/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
@@ -478,9 +478,9 @@ GenericTaintChecker::TaintPropagationRul @@ -478,9 +478,9 @@ GenericTaintChecker::TaintPropagationRul
case Builtin::BIstrncpy: case Builtin::BIstrncpy:
case Builtin::BIstrncat: case Builtin::BIstrncat:
@ -102,10 +101,10 @@ Index: llvm-toolchain-snapshot_12~++20201001102642+456974ac78f/clang/lib/StaticA
case Builtin::BIstrndup: case Builtin::BIstrndup:
return {{0, 1}, {ReturnValueIndex}}; return {{0, 1}, {ReturnValueIndex}};
Index: llvm-toolchain-snapshot_12~++20201001102642+456974ac78f/clang/test/Sema/builtins.c Index: llvm-toolchain-snapshot_12~++20201029014435+d6d6fdb068a/clang/test/Sema/builtins.c
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_12~++20201001102642+456974ac78f.orig/clang/test/Sema/builtins.c --- llvm-toolchain-snapshot_12~++20201029014435+d6d6fdb068a.orig/clang/test/Sema/builtins.c
+++ llvm-toolchain-snapshot_12~++20201001102642+456974ac78f/clang/test/Sema/builtins.c +++ llvm-toolchain-snapshot_12~++20201029014435+d6d6fdb068a/clang/test/Sema/builtins.c
@@ -199,11 +199,9 @@ void test18() { @@ -199,11 +199,9 @@ void test18() {
ptr = __builtin___memccpy_chk(dst, src, '\037', sizeof(src), sizeof(dst)); ptr = __builtin___memccpy_chk(dst, src, '\037', sizeof(src), sizeof(dst));
@ -148,9 +147,9 @@ Index: llvm-toolchain-snapshot_12~++20201001102642+456974ac78f/clang/test/Sema/b
// rdar://11076881 // rdar://11076881
char * Test20(char *p, const char *in, unsigned n) char * Test20(char *p, const char *in, unsigned n)
{ {
Index: llvm-toolchain-snapshot_12~++20201001102642+456974ac78f/clang/test/Sema/warn-strlcpycat-size.c Index: llvm-toolchain-snapshot_12~++20201029014435+d6d6fdb068a/clang/test/Sema/warn-strlcpycat-size.c
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_12~++20201001102642+456974ac78f.orig/clang/test/Sema/warn-strlcpycat-size.c --- llvm-toolchain-snapshot_12~++20201029014435+d6d6fdb068a.orig/clang/test/Sema/warn-strlcpycat-size.c
+++ /dev/null +++ /dev/null
@@ -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