6 files changed, 70 insertions, 69 deletions

diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index 9e5253fd149d..4b70a2225126 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	llvm
 PORTVERSION=	${LLVM_MAJOR}.d${SNAPDATE}
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	-devel
 
@@ -18,7 +18,7 @@ DATADIR=	${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
 USES=		cmake:outsource compiler:c++11-lib libedit perl5 \
 		shebangfix
 USE_LDCONFIG=	${LLVM_PREFIX}/lib
-_USES_PYTHON?=	python:build
+_USES_PYTHON?=	python:build:2.7
 USES+=		${_USES_PYTHON}
 SHEBANG_FILES=	utils/lit/lit.py utils/llvm-lit/llvm-lit.in \
 		tools/clang/tools/scan-view/bin/scan-view \
@@ -64,8 +64,7 @@ CLANG_EXTRA_PATCHES= \
 	${PATCHDIR}/clang-patch-fopenmp.diff \
 	${PATCHDIR}/clang-patch-tools_clang_tools_clang-format_clang-format.py \
 	${PATCHDIR}/clang-patch-tools_clang_tools_clang-format_clang-format-sublime.py \
-	${PATCHDIR}/clang-patch-tools_clang_tools_clang-format_git-clang-format \
-	${PATCHDIR}/clang-patch-tools_clang_lib_Headers_CMakeLists.txt
+	${PATCHDIR}/clang-patch-tools_clang_tools_clang-format_git-clang-format
 CLANG_CONFLICTS_INSTALL=	clang-devel-3.[1234567]*
 CLANG_GH_PROJECT=	clang:clang
 CLANG_GH_SUBDIR=	tools/clang:clang
@@ -99,7 +98,7 @@ LLDB_GH_PROJECT=	lldb:lldb
 LLDB_GH_SUBDIR=		tools/lldb:lldb
 LLDB_GH_TAGNAME=	${LLDB_COMMIT}:lldb
 LLDB_IMPLIES=		CLANG
-LLDB_VARS=		_USES_PYTHON=python
+LLDB_VARS=		_USES_PYTHON=python:2.7
 OPENMP_DESC=		Install libomp, the LLVM OpenMP runtime library
 OPENMP_CONFLICTS_INSTALL=	libiomp5-devel-*
 OPENMP_GH_PROJECT=	openmp:openmp
@@ -231,7 +230,7 @@ CLANG_PATTERN=	(c-index-test|clang|scan-|Reporter.py|ScanView.py|scanview.css|so
 .endif
 
 .if ${PORT_OPTIONS:MCOMPILER_RT}
-COMPILER_RT_PATTERN=	(asan_blacklist.txt|sanitizer|include.xray)
+COMPILER_RT_PATTERN=	(_blacklist.txt|sanitizer|include.xray)
 .endif
 
 .if ${PORT_OPTIONS:MLIT}
@@ -302,6 +301,8 @@ _COMPILER_RT_LIBS= \
 	libclang_rt.builtins-x86_64.a \
 	libclang_rt.dd-x86_64.a \
 	libclang_rt.dyndd-x86_64.so \
+	libclang_rt.fuzzer-x86_64.a \
+	libclang_rt.fuzzer_no_main-x86_64.a \
 	libclang_rt.lsan-x86_64.a \
 	libclang_rt.profile-x86_64.a \
 	libclang_rt.safestack-x86_64.a \
@@ -459,13 +460,13 @@ build-plist:
 	${FIND} ${STAGEDIR}${LLVM_PREFIX} -type f -o -type l | \
 	    ${GREP} -v '[/-]lit$$' | ${GREP} -v 'FileCheck$$' | \
 	    ${GREP} -v man/man1 | ${SED} -e 's|${STAGEDIR}${PREFIX}/||' \
+	    -e 's|${PYTHON_SITELIBDIR:C|${PREFIX}/||}|%%PYTHON_SITELIBDIR%%|' \
 	    -e 's|${PORTVERSION}|%%PORTVERSION%%|' \
 	    -e 's|release.cmake|%%CMAKE_BUILD_TYPE%%.cmake|' \
 	    -e 's|${LLVM_RELEASE:C/\./\\./g}|%%LLVM_RELEASE%%|' \
 	    -e 's|${LLVM_MAJOR:C/\./\\./}|%%LLVM_MAJOR%%|' \
 	    -e 's|\.${LLVM_MAJOR:C/\..*//}|.%%LLVM_LIB_VER%%|' \
-	    -e 's|${PYTHON_SITELIBDIR:C|${PREFIX}/||}|%%PYTHON_SITELIBDIR%%|' | \
-	    ${SORT} >> ${PLIST}.tmp
+	    | ${SORT} >> ${PLIST}.tmp
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX} -type f | \
 	    ${SED} -e 's|${STAGEDIR}${PYTHON_SITELIBDIR}|%%LIT%%%%PYTHON_SITELIBDIR%%|' \
 	    -e 's|${LLVM_RELEASE:C/\./\\./g}|%%LLVM_RELEASE%%|' \
diff --git a/devel/llvm-devel/Makefile.snapshot b/devel/llvm-devel/Makefile.snapshot
index 889b74f611a2..69962eb19ef1 100644
--- a/devel/llvm-devel/Makefile.snapshot
+++ b/devel/llvm-devel/Makefile.snapshot
@@ -4,14 +4,14 @@
 #
 # Generated by: files/gen-Makefile.snapshot.sh.
 #
-LLVM_MAJOR=	6.0
+LLVM_MAJOR=	7.0
 LLVM_RELEASE=	${LLVM_MAJOR}.0
-SNAPDATE=	20171207
+SNAPDATE=	20180119
 
-LLVM_COMMIT=		113753f1f65a96c18833e19fe61645b144f0bbdd
-CLANG_COMMIT=		08fe1221761fe36d59a47304d2b5e6ba66c61c87
-COMPILER_RT_COMMIT=	3c704eefe1dfb7f35e80b8af9bd80c6eeaf7d5de
-EXTRAS_COMMIT=		96f87452282d2684d6793e747206e396e8cd2359
-LLD_COMMIT=		db62e74d04a3dbf789695b68191eaeaf20bc3a65
-LLDB_COMMIT=		bdf0d2c215f1c639ccf63e1f9480be6a27402650
-OPENMP_COMMIT=		5a07983cf589c66eba013ea59d76ff828582eab7
+LLVM_COMMIT=		4f82436e1ddfde29383d98790bbac9de3612f092
+CLANG_COMMIT=		d91a0b81e57b81df9c049c2df0f298c39518ba0b
+COMPILER_RT_COMMIT=	8d059e127b62ac5ef58a29230ea3e71912b746cb
+EXTRAS_COMMIT=		fb61b3bf4eccaf4c325b8c2997c24cdf6a051146
+LLD_COMMIT=		82446b79aecea51055a1f17a13a42ea2578616f6
+LLDB_COMMIT=		e4a9fae7e1f11ee6fd90a349ac9e40f631ebe549
+OPENMP_COMMIT=		4b547f3c93d0a207d55b1d213c770d6641a917f1
diff --git a/devel/llvm-devel/distinfo b/devel/llvm-devel/distinfo
index 76043fb75513..8a33a7229f66 100644
--- a/devel/llvm-devel/distinfo
+++ b/devel/llvm-devel/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1512667354
-SHA256 (llvm-mirror-llvm-6.0.d20171207-113753f1f65a96c18833e19fe61645b144f0bbdd_GH0.tar.gz) = 182e934e0465dede3ed3ed1cefbc2c668e7d8dd3b5cec8662b680cf872ebe081
-SIZE (llvm-mirror-llvm-6.0.d20171207-113753f1f65a96c18833e19fe61645b144f0bbdd_GH0.tar.gz) = 37295580
-SHA256 (llvm-mirror-clang-08fe1221761fe36d59a47304d2b5e6ba66c61c87_GH0.tar.gz) = 37d8de5adfc1f4bb94f7b26a2a17ccd96755ade4a35f2011be49a7bbe7e1d5c7
-SIZE (llvm-mirror-clang-08fe1221761fe36d59a47304d2b5e6ba66c61c87_GH0.tar.gz) = 16568216
-SHA256 (llvm-mirror-compiler-rt-3c704eefe1dfb7f35e80b8af9bd80c6eeaf7d5de_GH0.tar.gz) = ad28696ccd16f70166bd647ef5b0f8b5c71a60a6bc74a933d83e90cfd5fc4d48
-SIZE (llvm-mirror-compiler-rt-3c704eefe1dfb7f35e80b8af9bd80c6eeaf7d5de_GH0.tar.gz) = 2857864
-SHA256 (llvm-mirror-clang-tools-extra-96f87452282d2684d6793e747206e396e8cd2359_GH0.tar.gz) = 9d31ca871b07d7c5ae5436f4a61028ca6a13902a8f8dc04b4503b462b79a0b61
-SIZE (llvm-mirror-clang-tools-extra-96f87452282d2684d6793e747206e396e8cd2359_GH0.tar.gz) = 984269
-SHA256 (llvm-mirror-lld-db62e74d04a3dbf789695b68191eaeaf20bc3a65_GH0.tar.gz) = 9de7271d14c1edfeb763421b6f8bc0ea5b3123c4cc705205153c3698518d8ae2
-SIZE (llvm-mirror-lld-db62e74d04a3dbf789695b68191eaeaf20bc3a65_GH0.tar.gz) = 1043983
-SHA256 (llvm-mirror-lldb-bdf0d2c215f1c639ccf63e1f9480be6a27402650_GH0.tar.gz) = 8a0e003390b4ae59fe4b8843b1a8ea0180136495f3d27a964cb2697ac226730d
-SIZE (llvm-mirror-lldb-bdf0d2c215f1c639ccf63e1f9480be6a27402650_GH0.tar.gz) = 24279490
-SHA256 (llvm-mirror-openmp-5a07983cf589c66eba013ea59d76ff828582eab7_GH0.tar.gz) = ad67cdb6b24a85f978348b86ab8db0a0b8c3851a1faab4e7ff2e1ac43659beaa
-SIZE (llvm-mirror-openmp-5a07983cf589c66eba013ea59d76ff828582eab7_GH0.tar.gz) = 2841699
+TIMESTAMP = 1516384151
+SHA256 (llvm-mirror-llvm-7.0.d20180119-4f82436e1ddfde29383d98790bbac9de3612f092_GH0.tar.gz) = d4d258dbcaf5c3967ee49f702c74a575ce5bbe2f72bbe3750de37ec06d6aa999
+SIZE (llvm-mirror-llvm-7.0.d20180119-4f82436e1ddfde29383d98790bbac9de3612f092_GH0.tar.gz) = 38298397
+SHA256 (llvm-mirror-clang-d91a0b81e57b81df9c049c2df0f298c39518ba0b_GH0.tar.gz) = b262ff185e5d856e8b572db0aa7caf918c731b2077864674203869246fa1a11a
+SIZE (llvm-mirror-clang-d91a0b81e57b81df9c049c2df0f298c39518ba0b_GH0.tar.gz) = 16853709
+SHA256 (llvm-mirror-compiler-rt-8d059e127b62ac5ef58a29230ea3e71912b746cb_GH0.tar.gz) = 026b44496e94c159efdfbc2c9e145b915d9f13401fa023d83913a2552d6835b3
+SIZE (llvm-mirror-compiler-rt-8d059e127b62ac5ef58a29230ea3e71912b746cb_GH0.tar.gz) = 2901082
+SHA256 (llvm-mirror-clang-tools-extra-fb61b3bf4eccaf4c325b8c2997c24cdf6a051146_GH0.tar.gz) = 3ed50669a3a7bd6da782eff8129014fa1f09ddc508142e16a18403efda9f301c
+SIZE (llvm-mirror-clang-tools-extra-fb61b3bf4eccaf4c325b8c2997c24cdf6a051146_GH0.tar.gz) = 1033474
+SHA256 (llvm-mirror-lld-82446b79aecea51055a1f17a13a42ea2578616f6_GH0.tar.gz) = 2f1752d8d9cba5609ae5cfd2bca55d7a661833d31d93cf59832bf6766389c9ee
+SIZE (llvm-mirror-lld-82446b79aecea51055a1f17a13a42ea2578616f6_GH0.tar.gz) = 1091939
+SHA256 (llvm-mirror-lldb-e4a9fae7e1f11ee6fd90a349ac9e40f631ebe549_GH0.tar.gz) = 9d4fbc7860cdfbe2c225172778a78679fe92b20101b73b599156d488cd9eb648
+SIZE (llvm-mirror-lldb-e4a9fae7e1f11ee6fd90a349ac9e40f631ebe549_GH0.tar.gz) = 24284281
+SHA256 (llvm-mirror-openmp-4b547f3c93d0a207d55b1d213c770d6641a917f1_GH0.tar.gz) = 17220548f2a070b46f9583458e5a3fb3f3ef3666a16f55aec3bdcc1df14a35a1
+SIZE (llvm-mirror-openmp-4b547f3c93d0a207d55b1d213c770d6641a917f1_GH0.tar.gz) = 2842763
diff --git a/devel/llvm-devel/files/clang-patch-tools_clang_lib_Headers_CMakeLists.txt b/devel/llvm-devel/files/clang-patch-tools_clang_lib_Headers_CMakeLists.txt
deleted file mode 100644
index 88d96891e1ec..000000000000
--- a/devel/llvm-devel/files/clang-patch-tools_clang_lib_Headers_CMakeLists.txt
+++ /dev/null
@@ -1,31 +0,0 @@
---- tools/clang/lib/Headers/CMakeLists.txt.orig
-+++ tools/clang/lib/Headers/CMakeLists.txt
-@@ -44,7 +44,6 @@
-   intrin.h
-   inttypes.h
-   iso646.h
--  limits.h
-   lwpintrin.h
-   lzcntintrin.h
-   mm3dnow.h
-@@ -64,20 +63,12 @@
-   s390intrin.h
-   shaintrin.h
-   smmintrin.h
--  stdalign.h
--  stdarg.h
--  stdatomic.h
--  stdbool.h
--  stddef.h
-   __stddef_max_align_t.h
--  stdint.h
--  stdnoreturn.h
-   tbmintrin.h
-   tgmath.h
-   tmmintrin.h
-   unwind.h
-   vadefs.h
--  varargs.h
-   vecintrin.h
-   wmmintrin.h
-   __wmmintrin_aes.h
diff --git a/devel/llvm-devel/files/gen-Makefile.snapshot.sh b/devel/llvm-devel/files/gen-Makefile.snapshot.sh
index bfb307300e99..acdaf37e09d9 100644
--- a/devel/llvm-devel/files/gen-Makefile.snapshot.sh
+++ b/devel/llvm-devel/files/gen-Makefile.snapshot.sh
@@ -17,7 +17,7 @@ cat <<EOF > Makefile.snapshot
 #
 # Generated by: files/gen-Makefile.snapshot.sh.
 #
-LLVM_MAJOR=	6.0
+LLVM_MAJOR=	7.0
 LLVM_RELEASE=	\${LLVM_MAJOR}.0
 SNAPDATE=	$(date +%Y%m%d)
 
diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist
index 096fb7e29e2b..f0b39ffe03a3 100644
--- a/devel/llvm-devel/pkg-plist
+++ b/devel/llvm-devel/pkg-plist
@@ -97,7 +97,6 @@ bin/sancov-devel
 %%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/utils/__init__.py
 %%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/utils/symbolication.py
 %%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/six.py
-%%COMPILER_RT%%llvm-devel/asan_blacklist.txt
 llvm-devel/bin/bugpoint
 %%CLANG%%llvm-devel/bin/c-index-test
 %%CLANG%%llvm-devel/bin/clang
@@ -186,7 +185,6 @@ llvm-devel/bin/sanstats
 llvm-devel/bin/verify-uselistorder
 %%LLD%%llvm-devel/bin/wasm-ld
 llvm-devel/bin/yaml2obj
-llvm-devel/cfi_blacklist.txt
 %%CLANG%%llvm-devel/include/clang-c/BuildSystem.h
 %%CLANG%%llvm-devel/include/clang-c/CXCompilationDatabase.h
 %%CLANG%%llvm-devel/include/clang-c/CXErrorCode.h
@@ -672,6 +670,7 @@ llvm-devel/cfi_blacklist.txt
 %%CLANG%%llvm-devel/include/clang/StaticAnalyzer/Frontend/ModelConsumer.h
 %%CLANG%%llvm-devel/include/clang/Tooling/ASTDiff/ASTDiff.h
 %%CLANG%%llvm-devel/include/clang/Tooling/ASTDiff/ASTDiffInternal.h
+%%CLANG%%llvm-devel/include/clang/Tooling/AllTUsExecution.h
 %%CLANG%%llvm-devel/include/clang/Tooling/ArgumentsAdjusters.h
 %%CLANG%%llvm-devel/include/clang/Tooling/CommonOptionsParser.h
 %%CLANG%%llvm-devel/include/clang/Tooling/CompilationDatabase.h
@@ -720,6 +719,7 @@ llvm-devel/cfi_blacklist.txt
 %%LLD%%llvm-devel/include/lld/Common/Strings.h
 %%LLD%%llvm-devel/include/lld/Common/TargetOptionsCommandFlags.h
 %%LLD%%llvm-devel/include/lld/Common/Threads.h
+%%LLD%%llvm-devel/include/lld/Common/Timer.h
 %%LLD%%llvm-devel/include/lld/Common/Version.h
 %%LLD%%llvm-devel/include/lld/Core/AbsoluteAtom.h
 %%LLD%%llvm-devel/include/lld/Core/ArchiveLibraryFile.h
@@ -1114,6 +1114,7 @@ llvm-devel/cfi_blacklist.txt
 %%LLDB%%llvm-devel/include/lldb/Utility/DataExtractor.h
 %%LLDB%%llvm-devel/include/lldb/Utility/Either.h
 %%LLDB%%llvm-devel/include/lldb/Utility/Endian.h
+%%LLDB%%llvm-devel/include/lldb/Utility/Environment.h
 %%LLDB%%llvm-devel/include/lldb/Utility/FastDemangle.h
 %%LLDB%%llvm-devel/include/lldb/Utility/FileSpec.h
 %%LLDB%%llvm-devel/include/lldb/Utility/Flags.h
@@ -1328,6 +1329,7 @@ llvm-devel/include/llvm/Analysis/ScalarEvolutionExpressions.h
 llvm-devel/include/llvm/Analysis/ScalarEvolutionNormalization.h
 llvm-devel/include/llvm/Analysis/ScopedNoAliasAA.h
 llvm-devel/include/llvm/Analysis/SparsePropagation.h
+llvm-devel/include/llvm/Analysis/SyntheticCountsUtils.h
 llvm-devel/include/llvm/Analysis/TargetFolder.h
 llvm-devel/include/llvm/Analysis/TargetLibraryInfo.def
 llvm-devel/include/llvm/Analysis/TargetLibraryInfo.h
@@ -1367,7 +1369,7 @@ llvm-devel/include/llvm/BinaryFormat/MachO.def
 llvm-devel/include/llvm/BinaryFormat/MachO.h
 llvm-devel/include/llvm/BinaryFormat/Magic.h
 llvm-devel/include/llvm/BinaryFormat/Wasm.h
-llvm-devel/include/llvm/BinaryFormat/WasmRelocs/WebAssembly.def
+llvm-devel/include/llvm/BinaryFormat/WasmRelocs.def
 llvm-devel/include/llvm/Bitcode/BitCodes.h
 llvm-devel/include/llvm/Bitcode/BitcodeReader.h
 llvm-devel/include/llvm/Bitcode/BitcodeWriter.h
@@ -1423,13 +1425,13 @@ llvm-devel/include/llvm/CodeGen/LexicalScopes.h
 llvm-devel/include/llvm/CodeGen/LinkAllAsmWriterComponents.h
 llvm-devel/include/llvm/CodeGen/LinkAllCodegenComponents.h
 llvm-devel/include/llvm/CodeGen/LiveInterval.h
-llvm-devel/include/llvm/CodeGen/LiveIntervalAnalysis.h
 llvm-devel/include/llvm/CodeGen/LiveIntervalUnion.h
+llvm-devel/include/llvm/CodeGen/LiveIntervals.h
 llvm-devel/include/llvm/CodeGen/LivePhysRegs.h
 llvm-devel/include/llvm/CodeGen/LiveRangeEdit.h
 llvm-devel/include/llvm/CodeGen/LiveRegMatrix.h
 llvm-devel/include/llvm/CodeGen/LiveRegUnits.h
-llvm-devel/include/llvm/CodeGen/LiveStackAnalysis.h
+llvm-devel/include/llvm/CodeGen/LiveStacks.h
 llvm-devel/include/llvm/CodeGen/LiveVariables.h
 llvm-devel/include/llvm/CodeGen/LowLevelType.h
 llvm-devel/include/llvm/CodeGen/MIRParser/MIRParser.h
@@ -1485,6 +1487,7 @@ llvm-devel/include/llvm/CodeGen/RegisterUsageInfo.h
 llvm-devel/include/llvm/CodeGen/ResourcePriorityQueue.h
 llvm-devel/include/llvm/CodeGen/RuntimeLibcalls.def
 llvm-devel/include/llvm/CodeGen/RuntimeLibcalls.h
+llvm-devel/include/llvm/CodeGen/SDNodeProperties.td
 llvm-devel/include/llvm/CodeGen/ScheduleDAG.h
 llvm-devel/include/llvm/CodeGen/ScheduleDAGInstrs.h
 llvm-devel/include/llvm/CodeGen/ScheduleDAGMutation.h
@@ -1553,6 +1556,7 @@ llvm-devel/include/llvm/DebugInfo/CodeView/EnumTables.h
 llvm-devel/include/llvm/DebugInfo/CodeView/Formatters.h
 llvm-devel/include/llvm/DebugInfo/CodeView/FunctionId.h
 llvm-devel/include/llvm/DebugInfo/CodeView/GUID.h
+llvm-devel/include/llvm/DebugInfo/CodeView/GlobalTypeTableBuilder.h
 llvm-devel/include/llvm/DebugInfo/CodeView/LazyRandomTypeCollection.h
 llvm-devel/include/llvm/DebugInfo/CodeView/Line.h
 llvm-devel/include/llvm/DebugInfo/CodeView/MergingTypeTableBuilder.h
@@ -1726,6 +1730,7 @@ llvm-devel/include/llvm/ExecutionEngine/ObjectCache.h
 llvm-devel/include/llvm/ExecutionEngine/ObjectMemoryBuffer.h
 llvm-devel/include/llvm/ExecutionEngine/Orc/CompileOnDemandLayer.h
 llvm-devel/include/llvm/ExecutionEngine/Orc/CompileUtils.h
+llvm-devel/include/llvm/ExecutionEngine/Orc/Core.h
 llvm-devel/include/llvm/ExecutionEngine/Orc/ExecutionUtils.h
 llvm-devel/include/llvm/ExecutionEngine/Orc/GlobalMappingLayer.h
 llvm-devel/include/llvm/ExecutionEngine/Orc/IRCompileLayer.h
@@ -2194,6 +2199,7 @@ llvm-devel/include/llvm/Transforms/IPO/PartialInlining.h
 llvm-devel/include/llvm/Transforms/IPO/PassManagerBuilder.h
 llvm-devel/include/llvm/Transforms/IPO/SCCP.h
 llvm-devel/include/llvm/Transforms/IPO/StripDeadPrototypes.h
+llvm-devel/include/llvm/Transforms/IPO/SyntheticCountsPropagation.h
 llvm-devel/include/llvm/Transforms/IPO/ThinLTOBitcodeWriter.h
 llvm-devel/include/llvm/Transforms/IPO/WholeProgramDevirt.h
 llvm-devel/include/llvm/Transforms/InstCombine/InstCombine.h
@@ -2246,6 +2252,7 @@ llvm-devel/include/llvm/Transforms/Scalar/NaryReassociate.h
 llvm-devel/include/llvm/Transforms/Scalar/NewGVN.h
 llvm-devel/include/llvm/Transforms/Scalar/PartiallyInlineLibCalls.h
 llvm-devel/include/llvm/Transforms/Scalar/Reassociate.h
+llvm-devel/include/llvm/Transforms/Scalar/RewriteStatepointsForGC.h
 llvm-devel/include/llvm/Transforms/Scalar/SCCP.h
 llvm-devel/include/llvm/Transforms/Scalar/SROA.h
 llvm-devel/include/llvm/Transforms/Scalar/SimpleLoopUnswitch.h
@@ -2316,9 +2323,11 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h
 %%COMPILER_RT%%llvm-devel/include/sanitizer/coverage_interface.h
 %%COMPILER_RT%%llvm-devel/include/sanitizer/dfsan_interface.h
 %%COMPILER_RT%%llvm-devel/include/sanitizer/esan_interface.h
+%%COMPILER_RT%%llvm-devel/include/sanitizer/hwasan_interface.h
 %%COMPILER_RT%%llvm-devel/include/sanitizer/linux_syscall_hooks.h
 %%COMPILER_RT%%llvm-devel/include/sanitizer/lsan_interface.h
 %%COMPILER_RT%%llvm-devel/include/sanitizer/msan_interface.h
+%%COMPILER_RT%%llvm-devel/include/sanitizer/scudo_interface.h
 %%COMPILER_RT%%llvm-devel/include/sanitizer/tsan_interface.h
 %%COMPILER_RT%%llvm-devel/include/sanitizer/tsan_interface_atomic.h
 %%COMPILER_RT%%llvm-devel/include/xray/xray_interface.h
@@ -2343,6 +2352,7 @@ llvm-devel/lib/LLVMHello.so
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/arm_neon.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/armintr.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx2intrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512bitalgintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512bwintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512cdintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512dqintrin.h
@@ -2351,13 +2361,19 @@ llvm-devel/lib/LLVMHello.so
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512ifmaintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512ifmavlintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512pfintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512vbmi2intrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512vbmiintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512vbmivlintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512vlbitalgintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512vlbwintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512vlcdintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512vldqintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512vlintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512vlvbmi2intrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512vlvnniintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512vnniintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512vpopcntdqintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512vpopcntdqvlintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avxintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/bmi2intrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/bmiintrin.h
@@ -2375,6 +2391,7 @@ llvm-devel/lib/LLVMHello.so
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/fma4intrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/fmaintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/fxsrintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/gfniintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/htmintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/htmxlintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/ia32intrin.h
@@ -2382,6 +2399,7 @@ llvm-devel/lib/LLVMHello.so
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/intrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/inttypes.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/iso646.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/limits.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/lwpintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/lzcntintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/mm3dnow.h
@@ -2392,6 +2410,7 @@ llvm-devel/lib/LLVMHello.so
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/mwaitxintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/nmmintrin.h
 %%OPENMP%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/omp.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/ompt.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/opencl-c.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/pkuintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/pmmintrin.h
@@ -2402,12 +2421,22 @@ llvm-devel/lib/LLVMHello.so
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/s390intrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/shaintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/smmintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/stdalign.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/stdarg.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/stdatomic.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/stdbool.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/stddef.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/stdint.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/stdnoreturn.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/tbmintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/tgmath.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/tmmintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/unwind.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/vadefs.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/vaesintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/varargs.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/vecintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/vpclmulqdqintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/wmmintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/x86intrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/xmmintrin.h
@@ -2752,6 +2781,8 @@ llvm-devel/lib/libLTO.so.%%LLVM_RELEASE%%svn
 %%OPENMP%%llvm-devel/lib/libomptarget.so
 %%CLANG%%llvm-devel/libexec/c++-analyzer
 %%CLANG%%llvm-devel/libexec/ccc-analyzer
+%%COMPILER_RT%%llvm-devel/share/asan_blacklist.txt
+%%COMPILER_RT%%llvm-devel/share/cfi_blacklist.txt
 %%CLANG%%llvm-devel/share/clang/bash-autocomplete.sh
 %%CLANG%%llvm-devel/share/clang/clang-format-bbedit.applescript
 %%CLANG%%llvm-devel/share/clang/clang-format-diff.py