[llvm-branch-commits] [llvm-branch] r293342 - Merging r291918:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Fri Jan 27 16:55:50 2017
New Revision: 293342

URL: http://llvm.org/viewvc/llvm-project?rev=293342&view=rev
Log:
Merging r291918:
------------------------------------------------------------------------
r291918 | krasin | 2017-01-13 09:30:10 -0800 (Fri, 13 Jan 2017) | 13 lines

Fix UBSan bots by blacklisting bits/stl_tree.h.

Summary:
libstdc++ has some undefined behavior in bits/stl_tree.h that
has recently became excercised by some of the LLVM code.
Given that fixing libstdc++ will take years, adding the file
into a blacklist to fix bots seems like a necessity.

Reviewers: vitalybuka

Subscribers: llvm-commits, mgorny

Differential Revision: https://reviews.llvm.org/D28686
------------------------------------------------------------------------

Added:
    llvm/branches/release_40/utils/sanitizers/
      - copied from r291918, llvm/trunk/utils/sanitizers/
Modified:
    llvm/branches/release_40/   (props changed)
    llvm/branches/release_40/cmake/modules/HandleLLVMOptions.cmake

Propchange: llvm/branches/release_40/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 27 16:55:50 2017
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,291858-291859,291863,291875,291909,291966,291968,291979,292133,292242,292254-292255,292280,292323,292444,292467,292516,292583,292625,292641,292651,292667,292711-292713,292758,293025,293259,293291,293293
+/llvm/trunk:155241,291858-291859,291863,291875,291909,291918,291966,291968,291979,292133,292242,292254-292255,292280,292323,292444,292467,292516,292583,292625,292641,292651,292667,292711-292713,292758,293025,293259,293291,293293

Modified: llvm/branches/release_40/cmake/modules/HandleLLVMOptions.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_40/cmake/modules/HandleLLVMOptions.cmake?rev=293342&r1=293341&r2=293342&view=diff
==============================================================================
--- llvm/branches/release_40/cmake/modules/HandleLLVMOptions.cmake (original)
+++ llvm/branches/release_40/cmake/modules/HandleLLVMOptions.cmake Fri Jan 27 16:55:50 2017
@@ -555,6 +555,8 @@ if(LLVM_USE_SANITIZER)
       append_common_sanitizer_flags()
       append("-fsanitize=undefined -fno-sanitize=vptr,function -fno-sanitize-recover=all"
               CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
+      append("-fsanitize-blacklist=${CMAKE_SOURCE_DIR}/utils/sanitizers/ubsan_blacklist.txt"
+	      CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
     elseif (LLVM_USE_SANITIZER STREQUAL "Thread")
       append_common_sanitizer_flags()
       append("-fsanitize=thread" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)