Merge branch 'snapshot' of salsa.debian.org:pkg-llvm-team/llvm-toolchain into snapshot

This commit is contained in:
Sylvestre Ledru 2019-04-04 16:58:58 +02:00
commit d890282f14
12 changed files with 75 additions and 104 deletions

2
debian/TODO vendored
View File

@ -1,3 +1,5 @@
* package utils/creduce-clang-crash.py
* add the support of libclang in llvm default (for now, it is
called libclang1-3.3.so)

3
debian/changelog vendored
View File

@ -1,6 +1,9 @@
llvm-toolchain-snapshot (1:9~svn356321-1~exp1) experimental; urgency=medium
* New snapshot release
* Remove libc++fs.a (done upstream)
* add clang-doc in clang-tools
* python2.7/site-packages/readline.so removed from liblldb
-- Sylvestre Ledru <sylvestre@debian.org> Sat, 16 Mar 2019 11:57:35 +0100

View File

@ -26,6 +26,7 @@ usr/lib/llvm-@LLVM_VERSION@/bin/clang-refactor
usr/lib/llvm-@LLVM_VERSION@/bin/diagtool
usr/lib/llvm-@LLVM_VERSION@/bin/hmaptool
usr/lib/llvm-@LLVM_VERSION@/bin/clang-extdef-mapping
usr/lib/llvm-@LLVM_VERSION@/bin/clang-doc
tools/clang/tools/scan-build-@LLVM_VERSION@ usr/share/clang/
tools/clang/tools/scan-build-py-@LLVM_VERSION@ usr/share/clang/
@ -55,3 +56,4 @@ usr/bin/clang-refactor-@LLVM_VERSION@
usr/bin/diagtool-@LLVM_VERSION@
usr/bin/hmaptool-@LLVM_VERSION@
usr/bin/clang-extdef-mapping-@LLVM_VERSION@
usr/bin/clang-doc-@LLVM_VERSION@

View File

@ -1,5 +1,4 @@
usr/lib/llvm-@LLVM_VERSION@/lib/libc++.so
usr/lib/llvm-@LLVM_VERSION@/lib/libc++.a
usr/lib/llvm-@LLVM_VERSION@/lib/libc++fs.a
usr/lib/llvm-@LLVM_VERSION@/lib/libc++experimental.a
usr/lib/llvm-@LLVM_VERSION@/include/c++/

View File

@ -1,3 +1,2 @@
libc++-@LLVM_VERSION@-dev: arch-dependent-file-not-in-arch-specific-directory usr/lib/llvm-@LLVM_VERSION@/lib/libc++.a
libc++-@LLVM_VERSION@-dev: arch-dependent-file-not-in-arch-specific-directory usr/lib/llvm-@LLVM_VERSION@/lib/libc++fs.a
libc++-@LLVM_VERSION@-dev: arch-dependent-file-not-in-arch-specific-directory usr/lib/llvm-@LLVM_VERSION@/lib/libc++experimental.a

View File

@ -1,2 +1,2 @@
usr/lib/llvm-7/lib/liblldb-7.so.1 /usr/lib/i386-kfreebsd-gnu/
usr/lib/llvm-7/lib/python2.7/site-packages/readline.so
#usr/lib/llvm-7/lib/python2.7/site-packages/readline.so

View File

@ -1,4 +1,4 @@
usr/lib/llvm-@LLVM_VERSION@/lib/liblldb-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/
usr/lib/llvm-@LLVM_VERSION@/lib/python2.7/site-packages/readline.so
#usr/lib/llvm-@LLVM_VERSION@/lib/python2.7/site-packages/readline.so
usr/lib/llvm-@LLVM_VERSION@/lib/liblldbIntelFeatures.so.*

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_9~svn356125/clang/include/clang/Basic/Builtins.def
Index: llvm-toolchain-snapshot_9~svn356622/clang/include/clang/Basic/Builtins.def
===================================================================
--- llvm-toolchain-snapshot_9~svn356125.orig/clang/include/clang/Basic/Builtins.def
+++ llvm-toolchain-snapshot_9~svn356125/clang/include/clang/Basic/Builtins.def
--- llvm-toolchain-snapshot_9~svn356622.orig/clang/include/clang/Basic/Builtins.def
+++ llvm-toolchain-snapshot_9~svn356622/clang/include/clang/Basic/Builtins.def
@@ -520,8 +520,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_9~svn356125/clang/include/clang/Basic/Builtins.de
// 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_9~svn356125/clang/lib/AST/Decl.cpp
Index: llvm-toolchain-snapshot_9~svn356622/clang/lib/AST/Decl.cpp
===================================================================
--- llvm-toolchain-snapshot_9~svn356125.orig/clang/lib/AST/Decl.cpp
+++ llvm-toolchain-snapshot_9~svn356125/clang/lib/AST/Decl.cpp
@@ -3660,13 +3660,13 @@ unsigned FunctionDecl::getMemoryFunction
--- llvm-toolchain-snapshot_9~svn356622.orig/clang/lib/AST/Decl.cpp
+++ llvm-toolchain-snapshot_9~svn356622/clang/lib/AST/Decl.cpp
@@ -3664,13 +3664,13 @@ unsigned FunctionDecl::getMemoryFunction
case Builtin::BImemmove:
return Builtin::BImemmove;
@ -57,26 +57,22 @@ Index: llvm-toolchain-snapshot_9~svn356125/clang/lib/AST/Decl.cpp
case Builtin::BI__builtin_memcmp:
case Builtin::BImemcmp:
Index: llvm-toolchain-snapshot_9~svn356125/clang/lib/Sema/SemaChecking.cpp
Index: llvm-toolchain-snapshot_9~svn356622/clang/lib/Sema/SemaChecking.cpp
===================================================================
--- llvm-toolchain-snapshot_9~svn356125.orig/clang/lib/Sema/SemaChecking.cpp
+++ llvm-toolchain-snapshot_9~svn356125/clang/lib/Sema/SemaChecking.cpp
@@ -1314,12 +1314,12 @@ Sema::CheckBuiltinFunctionCall(FunctionD
--- llvm-toolchain-snapshot_9~svn356622.orig/clang/lib/Sema/SemaChecking.cpp
+++ llvm-toolchain-snapshot_9~svn356622/clang/lib/Sema/SemaChecking.cpp
@@ -320,8 +320,8 @@ void Sema::checkFortifiedBuiltinMemoryFu
case Builtin::BI__builtin___memcpy_chk:
case Builtin::BI__builtin___memmove_chk:
case Builtin::BI__builtin___memset_chk:
SemaBuiltinMemChkCall(*this, FDecl, TheCall, 2, 3, "memset");
break;
- case Builtin::BI__builtin___strlcat_chk:
+/* case Builtin::BI__builtin___strlcat_chk:
SemaBuiltinMemChkCall(*this, FDecl, TheCall, 2, 3, "strlcat");
break;
case Builtin::BI__builtin___strlcpy_chk:
SemaBuiltinMemChkCall(*this, FDecl, TheCall, 2, 3, "strlcpy");
- break;
+ break;*/
- case Builtin::BI__builtin___strlcpy_chk:
+// case Builtin::BI__builtin___strlcat_chk:
+// case Builtin::BI__builtin___strlcpy_chk:
case Builtin::BI__builtin___strncat_chk:
SemaBuiltinMemChkCall(*this, FDecl, TheCall, 2, 3, "strncat");
break;
@@ -4248,9 +4248,10 @@ bool Sema::CheckFunctionCall(FunctionDec
case Builtin::BI__builtin___strncpy_chk:
case Builtin::BI__builtin___stpncpy_chk:
@@ -4309,9 +4309,10 @@ bool Sema::CheckFunctionCall(FunctionDec
return false;
// Handle memory setting and copying functions.
@ -90,10 +86,10 @@ Index: llvm-toolchain-snapshot_9~svn356125/clang/lib/Sema/SemaChecking.cpp
CheckStrncatArguments(TheCall, FnInfo);
else
CheckMemaccessArguments(TheCall, CMId, FnInfo);
Index: llvm-toolchain-snapshot_9~svn356125/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
Index: llvm-toolchain-snapshot_9~svn356622/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
===================================================================
--- llvm-toolchain-snapshot_9~svn356125.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
+++ llvm-toolchain-snapshot_9~svn356125/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
--- llvm-toolchain-snapshot_9~svn356622.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
+++ llvm-toolchain-snapshot_9~svn356622/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
@@ -256,9 +256,9 @@ GenericTaintChecker::TaintPropagationRul
case Builtin::BIstrncpy:
case Builtin::BIstrncat:
@ -107,58 +103,55 @@ Index: llvm-toolchain-snapshot_9~svn356125/clang/lib/StaticAnalyzer/Checkers/Gen
case Builtin::BIstrndup:
return TaintPropagationRule({0, 1}, {ReturnValueIndex});
Index: llvm-toolchain-snapshot_9~svn356125/clang/test/Sema/builtins.c
Index: llvm-toolchain-snapshot_9~svn356622/clang/test/Sema/builtins.c
===================================================================
--- llvm-toolchain-snapshot_9~svn356125.orig/clang/test/Sema/builtins.c
+++ llvm-toolchain-snapshot_9~svn356125/clang/test/Sema/builtins.c
@@ -199,11 +199,11 @@ void test18() {
--- llvm-toolchain-snapshot_9~svn356622.orig/clang/test/Sema/builtins.c
+++ llvm-toolchain-snapshot_9~svn356622/clang/test/Sema/builtins.c
@@ -199,11 +199,9 @@ void test18() {
ptr = __builtin___memccpy_chk(dst, src, '\037', sizeof(src), sizeof(dst));
result = __builtin___strlcpy_chk(dst, src, sizeof(dst), sizeof(dst));
- result = __builtin___strlcat_chk(dst, src, sizeof(dst), sizeof(dst));
+// result = __builtin___strlcat_chk(dst, src, sizeof(dst), sizeof(dst));
ptr = __builtin___memccpy_chk(dst, src, '\037', sizeof(src)); // expected-error {{too few arguments to function call}}
ptr = __builtin___strlcpy_chk(dst, src, sizeof(dst), sizeof(dst)); // expected-warning {{incompatible integer to pointer conversion}}
- ptr = __builtin___strlcat_chk(dst, src, sizeof(dst), sizeof(dst)); // expected-warning {{incompatible integer to pointer conversion}}
+// ptr = __builtin___strlcat_chk(dst, src, sizeof(dst), sizeof(dst)); // expected-warning {{incompatible integer to pointer conversion}}
}
void no_ms_builtins() {
@@ -218,12 +218,12 @@ void unavailable() {
@@ -217,29 +215,6 @@ void unavailable() {
__builtin_operator_delete(0); // expected-error {{'__builtin_operator_delete' is only available in C++}}
}
// rdar://18259539
-// 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);
+//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);
void Test19(void)
{
-
-void Test19(void)
-{
- static char b[40];
+/* static char b[40];
static char buf[20];
strlcpy(buf, b, sizeof(b)); // expected-warning {{size argument in 'strlcpy' call appears to be size of the source; expected the size of the destination}} \\
@@ -232,12 +232,13 @@ void Test19(void)
// expected-note {{change size argument to be the size of the destination}} \
// expected-warning {{'__builtin___strlcpy_chk' will always overflow; destination buffer has size 20, but size argument is 40}}
- static char buf[20];
-
- strlcpy(buf, b, sizeof(b)); // 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}}
- __builtin___strlcpy_chk(buf, b, sizeof(b), __builtin_object_size(buf, 0)); // expected-warning {{size argument in '__builtin___strlcpy_chk' 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}} \
- // expected-warning {{'strlcpy' will always overflow; destination buffer has size 20, but size argument is 40}}
-
- strlcat(buf, b, sizeof(b)); // expected-warning {{size argument in 'strlcat' call appears to be size of the source; expected the size of the destination}} \
+/* strlcat(buf, b, sizeof(b)); // expected-warning {{size argument in 'strlcat' 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}}
__builtin___strlcat_chk(buf, b, sizeof(b), __builtin_object_size(buf, 0)); // expected-warning {{size argument in '__builtin___strlcat_chk' 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}} \
// expected-warning {{'__builtin___strlcat_chk' will always overflow; destination buffer has size 20, but size argument is 40}}
+*/
}
- // expected-note {{change size argument to be the size of the destination}}
-
- __builtin___strlcat_chk(buf, b, sizeof(b), __builtin_object_size(buf, 0)); // expected-warning {{size argument in '__builtin___strlcat_chk' 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}} \
- // expected-warning {{'strlcat' will always overflow; destination buffer has size 20, but size argument is 40}}
-}
-
// rdar://11076881
Index: llvm-toolchain-snapshot_9~svn356125/clang/test/Sema/warn-strlcpycat-size.c
char * Test20(char *p, const char *in, unsigned n)
{
Index: llvm-toolchain-snapshot_9~svn356622/clang/test/Sema/warn-strlcpycat-size.c
===================================================================
--- llvm-toolchain-snapshot_9~svn356125.orig/clang/test/Sema/warn-strlcpycat-size.c
--- llvm-toolchain-snapshot_9~svn356622.orig/clang/test/Sema/warn-strlcpycat-size.c
+++ /dev/null
@@ -1,55 +0,0 @@
-// RUN: %clang_cc1 -Wstrlcpy-strlcat-size -verify -fsyntax-only %s

View File

@ -1,26 +0,0 @@
Index: llvm-toolchain-snapshot_9~svn339515.orig/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp
===================================================================
--- llvm-toolchain-snapshot_9~svn339515.orig/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp (révision 355787)
+++ llvm-toolchain-snapshot_9~svn339515/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp (copie de travail)
@@ -265,16 +265,16 @@
consumeError(AddrOrErr.takeError());
continue;
}
- uint64_t Addr = *AddrOrErr;
uint64_t Size = P.second;
-
+ object::SectionedAddress Address;
+ Address.Address = *AddrOrErr;
// According to spec debugging info has to come before loading the
// corresonding code load.
DILineInfoTable Lines = Context->getLineInfoForAddressRange(
- Addr, Size, FileLineInfoKind::AbsoluteFilePath);
+ Address, Size, FileLineInfoKind::AbsoluteFilePath);
- NotifyDebug(Addr, Lines);
- NotifyCode(Name, Addr, Size);
+ NotifyDebug(*AddrOrErr, Lines);
+ NotifyCode(Name, *AddrOrErr, Size);
}
Dumpstream->flush();

View File

@ -1,7 +1,7 @@
Index: llvm-toolchain-snapshot_9~svn353687/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
Index: llvm-toolchain-snapshot_9~svn357176/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
===================================================================
--- llvm-toolchain-snapshot_9~svn353687.orig/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
+++ llvm-toolchain-snapshot_9~svn353687/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
--- llvm-toolchain-snapshot_9~svn357176.orig/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
+++ llvm-toolchain-snapshot_9~svn357176/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
@@ -7,6 +7,7 @@
//===----------------------------------------------------------------------===//
//
@ -10,14 +10,15 @@ Index: llvm-toolchain-snapshot_9~svn353687/libcxx/test/std/thread/thread.conditi
// FLAKY_TEST.
Index: llvm-toolchain-snapshot_9~svn353687/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
Index: llvm-toolchain-snapshot_9~svn357176/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
===================================================================
--- llvm-toolchain-snapshot_9~svn353687.orig/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
+++ llvm-toolchain-snapshot_9~svn353687/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
@@ -8,6 +8,7 @@
--- llvm-toolchain-snapshot_9~svn357176.orig/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
+++ llvm-toolchain-snapshot_9~svn357176/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
@@ -8,7 +8,7 @@
//
// UNSUPPORTED: libcpp-has-no-threads
// UNSUPPORTED: c++98, c++03, c++11
-// XFAIL: dylib-has-no-shared_mutex
+// XFAIL: *
// FLAKY_TEST.

View File

@ -6,11 +6,11 @@ Last-Update: 2016-07-27
lldb/cmake/LLDBDependencies.cmake | 6 ++++++
1 file changed, 6 insertions(+)
Index: llvm-toolchain-snapshot_9~svn351647/lldb/source/Utility/CMakeLists.txt
Index: llvm-toolchain-snapshot_9~svn357377/lldb/source/Utility/CMakeLists.txt
===================================================================
--- llvm-toolchain-snapshot_9~svn351647.orig/lldb/source/Utility/CMakeLists.txt
+++ llvm-toolchain-snapshot_9~svn351647/lldb/source/Utility/CMakeLists.txt
@@ -32,6 +32,14 @@ endif()
--- llvm-toolchain-snapshot_9~svn357377.orig/lldb/source/Utility/CMakeLists.txt
+++ llvm-toolchain-snapshot_9~svn357377/lldb/source/Utility/CMakeLists.txt
@@ -2,6 +2,13 @@ set(LLDB_SYSTEM_LIBS)
list(APPEND LLDB_SYSTEM_LIBS ${system_libs})
@ -21,7 +21,6 @@ Index: llvm-toolchain-snapshot_9~svn351647/lldb/source/Utility/CMakeLists.txt
+ list(APPEND LLDB_SYSTEM_LIBS atomic)
+endif()
+
+
if (LLVM_BUILD_STATIC)
if (NOT LLDB_DISABLE_PYTHON)
list(APPEND LLDB_SYSTEM_LIBS python2.7 util)
if (CMAKE_SYSTEM_NAME MATCHES "Windows")
list(APPEND LLDB_SYSTEM_LIBS ws2_32 rpcrt4)
endif ()

View File

@ -126,4 +126,3 @@ kfreebsd/lib_Target_X86.diff
kfreebsd/lldb_source_Host_freebsd_Host.cpp.diff
kfreebsd/lldb_source_Plugins_Process_FreeBSD.diff
kfreebsd/tools_llvm-shlib_CMakeLists.txt.diff
D59189-unbreak.diff