Update to a more recent snapshot.

Work around upstream breakage in LLDB.

Sponsored by:	DARPA, AFRL

5 files changed, 58 insertions, 29 deletions

diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index 493d05f4c15c..ad9630f95725 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -118,6 +118,7 @@ LLD_GH_SUBDIR=		tools/lld:lld
 LLD_GH_TAGNAME=		${LLD_COMMIT}:lld
 LLDB_BUILD_DEPENDS=	swig3.0:devel/swig30
 LLDB_DESC=		Install lldb, the LLVM debugger
+LLDB_EXTRA_PATCHES=	${PATCHDIR}/lldb-patch-tools_lldb_source_Plugins_Process_FreeBSD_ProcessFreeBSD.cpp
 LLDB_GH_PROJECT=	lldb:lldb
 LLDB_GH_SUBDIR=		tools/lldb:lldb
 LLDB_GH_TAGNAME=	${LLDB_COMMIT}:lldb
@@ -150,6 +151,7 @@ COMMANDS=	bugpoint \
 		llvm-config \
 		llvm-cov \
 		llvm-cvtres \
+		llvm-cxxmap \
 		llvm-diff \
 		llvm-dis \
 		llvm-dlltool \
@@ -196,6 +198,7 @@ MAN1SRCS+=	bugpoint.1 \
 		llvm-build.1 \
 		llvm-config.1 \
 		llvm-cov.1 \
+		llvm-cxxmap.1 \
 		llvm-diff.1 \
 		llvm-dis.1 \
 		llvm-dwarfdump.1 \
diff --git a/devel/llvm-devel/Makefile.snapshot b/devel/llvm-devel/Makefile.snapshot
index 2a5d58cd8740..fb59cb246121 100644
--- a/devel/llvm-devel/Makefile.snapshot
+++ b/devel/llvm-devel/Makefile.snapshot
@@ -6,12 +6,12 @@
 #
 LLVM_MAJOR=	8
 LLVM_RELEASE=	${LLVM_MAJOR}.0.0
-SNAPDATE=	20180913
+SNAPDATE=	20180925
 
-LLVM_COMMIT=		c8301cc3196983edadfa805e36b6c62aec07fd4d
-CLANG_COMMIT=		9d84dfe6d9287f369db739b280e9626660b01f00
-COMPILER_RT_COMMIT=	c75544b66e2e0a6d32582b916caa61aa09337dc2
-EXTRAS_COMMIT=		2266973c4cf45d86fbfa2bdefcfd43d308d6a43e
-LLD_COMMIT=		72803c47f6c7d5ebbcccf44651403654fa60b903
-LLDB_COMMIT=		928b6628d2239a6168b9c604ef6934c85f799afc
-OPENMP_COMMIT=		5cab53912c861aced728fb6e6458a44c0adbef56
+LLVM_COMMIT=		b418c2351b1fdf6faf6a2d010d804e895ef49932
+CLANG_COMMIT=		d6cae43ad5a45c099fa3917def61170a9fdf6c97
+COMPILER_RT_COMMIT=	c5cf78381530dda36a14ef2eef0d94f8c87ae674
+EXTRAS_COMMIT=		0eddbe908913429e4f69b4a877f9c0ca28e08382
+LLD_COMMIT=		bc9e188d140ff03d5851a6bebe76e486d389d856
+LLDB_COMMIT=		12046a6124750689bba1c3eb881e366be4030a77
+OPENMP_COMMIT=		e1688b470b8ef3441983d333a6642e7b19d29b90
diff --git a/devel/llvm-devel/distinfo b/devel/llvm-devel/distinfo
index eb798bbfb5f9..c9216e637000 100644
--- a/devel/llvm-devel/distinfo
+++ b/devel/llvm-devel/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1536860319
-SHA256 (llvm-mirror-llvm-8.0.d20180913-c8301cc3196983edadfa805e36b6c62aec07fd4d_GH0.tar.gz) = 8f9344612c3fb0028b8acf984bb79bc3f02ec045cc229118711b5cbbea0939ef
-SIZE (llvm-mirror-llvm-8.0.d20180913-c8301cc3196983edadfa805e36b6c62aec07fd4d_GH0.tar.gz) = 43400238
-SHA256 (llvm-mirror-clang-9d84dfe6d9287f369db739b280e9626660b01f00_GH0.tar.gz) = f8ff23def38021070efc851fcabd84c40b4949ac41f8c26759b740702b311482
-SIZE (llvm-mirror-clang-9d84dfe6d9287f369db739b280e9626660b01f00_GH0.tar.gz) = 17711325
-SHA256 (llvm-mirror-compiler-rt-c75544b66e2e0a6d32582b916caa61aa09337dc2_GH0.tar.gz) = da1abbbc44a17d60d44cad7e00ee9b7b4173e956c012aaed4eea2ffc124ef5e4
-SIZE (llvm-mirror-compiler-rt-c75544b66e2e0a6d32582b916caa61aa09337dc2_GH0.tar.gz) = 3165929
-SHA256 (llvm-mirror-clang-tools-extra-2266973c4cf45d86fbfa2bdefcfd43d308d6a43e_GH0.tar.gz) = 8d5372e45ceacadbffe0ac4166997bc8ba07e22a48b5a8a7615844b63f7003b7
-SIZE (llvm-mirror-clang-tools-extra-2266973c4cf45d86fbfa2bdefcfd43d308d6a43e_GH0.tar.gz) = 1279689
-SHA256 (llvm-mirror-lld-72803c47f6c7d5ebbcccf44651403654fa60b903_GH0.tar.gz) = 60a3f69cae62d5b1055c5a5697bfd42ae358ad07fc6151dc2326ddd9ca6d3d10
-SIZE (llvm-mirror-lld-72803c47f6c7d5ebbcccf44651403654fa60b903_GH0.tar.gz) = 1296218
-SHA256 (llvm-mirror-lldb-928b6628d2239a6168b9c604ef6934c85f799afc_GH0.tar.gz) = a4af4663fe8831d5f6ee375b08451da7ef6a2771550736c8e5545c5c2ddc2cc9
-SIZE (llvm-mirror-lldb-928b6628d2239a6168b9c604ef6934c85f799afc_GH0.tar.gz) = 24511068
-SHA256 (llvm-mirror-openmp-5cab53912c861aced728fb6e6458a44c0adbef56_GH0.tar.gz) = edf3290b2da7852bda8456e81f0bdc070e4b98c41f7df8421a9b36501a3f0a9a
-SIZE (llvm-mirror-openmp-5cab53912c861aced728fb6e6458a44c0adbef56_GH0.tar.gz) = 1446563
+TIMESTAMP = 1537891825
+SHA256 (llvm-mirror-llvm-8.0.d20180925-b418c2351b1fdf6faf6a2d010d804e895ef49932_GH0.tar.gz) = f70fea382b3058b06416925f3a796f72e0b1bdc72f5a68283daadbb68b851c50
+SIZE (llvm-mirror-llvm-8.0.d20180925-b418c2351b1fdf6faf6a2d010d804e895ef49932_GH0.tar.gz) = 43610028
+SHA256 (llvm-mirror-clang-d6cae43ad5a45c099fa3917def61170a9fdf6c97_GH0.tar.gz) = 9f4bec9fe0f739a19f88ae2ae2414d6f8bde13c6ee9ce495db77475ed5d41de8
+SIZE (llvm-mirror-clang-d6cae43ad5a45c099fa3917def61170a9fdf6c97_GH0.tar.gz) = 17743175
+SHA256 (llvm-mirror-compiler-rt-c5cf78381530dda36a14ef2eef0d94f8c87ae674_GH0.tar.gz) = b5537492aa4fef086c8782db33d17fbfcca110900626c2f40a3baa0643fd698d
+SIZE (llvm-mirror-compiler-rt-c5cf78381530dda36a14ef2eef0d94f8c87ae674_GH0.tar.gz) = 3169979
+SHA256 (llvm-mirror-clang-tools-extra-0eddbe908913429e4f69b4a877f9c0ca28e08382_GH0.tar.gz) = ba1fd5634240facd766958a83642aa4563a210cb83ed8b470cad50a21c66d4ed
+SIZE (llvm-mirror-clang-tools-extra-0eddbe908913429e4f69b4a877f9c0ca28e08382_GH0.tar.gz) = 1284915
+SHA256 (llvm-mirror-lld-bc9e188d140ff03d5851a6bebe76e486d389d856_GH0.tar.gz) = dc0bec0ee38e45fff568d1a096c791a435ce5aaaad5049cd108fd8073d5cb326
+SIZE (llvm-mirror-lld-bc9e188d140ff03d5851a6bebe76e486d389d856_GH0.tar.gz) = 1311086
+SHA256 (llvm-mirror-lldb-12046a6124750689bba1c3eb881e366be4030a77_GH0.tar.gz) = 809923ab8aef405c1529b40a7f37eb8506a328cca305f56e858474156a912173
+SIZE (llvm-mirror-lldb-12046a6124750689bba1c3eb881e366be4030a77_GH0.tar.gz) = 24534585
+SHA256 (llvm-mirror-openmp-e1688b470b8ef3441983d333a6642e7b19d29b90_GH0.tar.gz) = 434e57ba3cf4c6aef50905f66529595c2f45742155b8403631cfd59084454efa
+SIZE (llvm-mirror-openmp-e1688b470b8ef3441983d333a6642e7b19d29b90_GH0.tar.gz) = 1446924
diff --git a/devel/llvm-devel/files/lldb-patch-tools_lldb_source_Plugins_Process_FreeBSD_ProcessFreeBSD.cpp b/devel/llvm-devel/files/lldb-patch-tools_lldb_source_Plugins_Process_FreeBSD_ProcessFreeBSD.cpp
new file mode 100644
index 000000000000..1c6b0582a522
--- /dev/null
+++ b/devel/llvm-devel/files/lldb-patch-tools_lldb_source_Plugins_Process_FreeBSD_ProcessFreeBSD.cpp
@@ -0,0 +1,20 @@
+--- tools/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp.orig
++++ tools/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp
+@@ -335,7 +335,7 @@
+     GetTarget().SetArchitecture(module_arch);
+ 
+   // Initialize the target module list
+-  GetTarget().SetExecutableModule(exe_module_sp, true);
++  GetTarget().SetExecutableModule(exe_module_sp, eLoadDependentsYes);
+ 
+   SetSTDIOFileDescriptor(m_monitor->GetTerminalFD());
+ 
+@@ -519,7 +519,7 @@
+           executable_search_paths.GetSize() ? &executable_search_paths : NULL);
+       if (!error.Success())
+         return;
+-      target->SetExecutableModule(exe_module_sp, true);
++      target->SetExecutableModule(exe_module_sp, eLoadDependentsYes);
+     }
+   }
+ }
diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist
index 6b40eb6f86df..4ba16db2f1df 100644
--- a/devel/llvm-devel/pkg-plist
+++ b/devel/llvm-devel/pkg-plist
@@ -12,6 +12,7 @@ bin/llvm-cfi-verify-devel
 bin/llvm-config-devel
 bin/llvm-cov-devel
 bin/llvm-cvtres-devel
+bin/llvm-cxxmap-devel
 bin/llvm-diff-devel
 bin/llvm-dis-devel
 bin/llvm-dlltool-devel
@@ -153,6 +154,7 @@ llvm-devel/bin/llvm-cov
 llvm-devel/bin/llvm-cvtres
 llvm-devel/bin/llvm-cxxdump
 llvm-devel/bin/llvm-cxxfilt
+llvm-devel/bin/llvm-cxxmap
 llvm-devel/bin/llvm-diff
 llvm-devel/bin/llvm-dis
 llvm-devel/bin/llvm-dlltool
@@ -330,7 +332,6 @@ llvm-devel/bin/yaml2obj
 %%CLANG%%llvm-devel/include/clang/Analysis/Analyses/LiveVariables.h
 %%CLANG%%llvm-devel/include/clang/Analysis/Analyses/OSLog.h
 %%CLANG%%llvm-devel/include/clang/Analysis/Analyses/PostOrderCFGView.h
-%%CLANG%%llvm-devel/include/clang/Analysis/Analyses/PseudoConstantAnalysis.h
 %%CLANG%%llvm-devel/include/clang/Analysis/Analyses/ReachableCode.h
 %%CLANG%%llvm-devel/include/clang/Analysis/Analyses/ThreadSafety.h
 %%CLANG%%llvm-devel/include/clang/Analysis/Analyses/ThreadSafetyCommon.h
@@ -856,6 +857,7 @@ llvm-devel/bin/yaml2obj
 %%LLDB%%llvm-devel/include/lldb/Breakpoint/BreakpointResolverFileLine.h
 %%LLDB%%llvm-devel/include/lldb/Breakpoint/BreakpointResolverFileRegex.h
 %%LLDB%%llvm-devel/include/lldb/Breakpoint/BreakpointResolverName.h
+%%LLDB%%llvm-devel/include/lldb/Breakpoint/BreakpointResolverScripted.h
 %%LLDB%%llvm-devel/include/lldb/Breakpoint/BreakpointSite.h
 %%LLDB%%llvm-devel/include/lldb/Breakpoint/BreakpointSiteList.h
 %%LLDB%%llvm-devel/include/lldb/Breakpoint/Stoppoint.h
@@ -1720,6 +1722,7 @@ llvm-devel/include/llvm/DebugInfo/CodeView/TypeHashing.h
 llvm-devel/include/llvm/DebugInfo/CodeView/TypeIndex.h
 llvm-devel/include/llvm/DebugInfo/CodeView/TypeIndexDiscovery.h
 llvm-devel/include/llvm/DebugInfo/CodeView/TypeRecord.h
+llvm-devel/include/llvm/DebugInfo/CodeView/TypeRecordHelpers.h
 llvm-devel/include/llvm/DebugInfo/CodeView/TypeRecordMapping.h
 llvm-devel/include/llvm/DebugInfo/CodeView/TypeStreamMerger.h
 llvm-devel/include/llvm/DebugInfo/CodeView/TypeSymbolEmitter.h
@@ -1814,9 +1817,12 @@ llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeEnumTypes.h
 llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeExeSymbol.h
 llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeRawSymbol.h
 llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeSession.h
+llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeSymbolEnumerator.h
 llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeTypeBuiltin.h
 llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeTypeEnum.h
+llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeTypeFunctionSig.h
 llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeTypePointer.h
+llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeTypeUDT.h
 llvm-devel/include/llvm/DebugInfo/PDB/Native/PDBFile.h
 llvm-devel/include/llvm/DebugInfo/PDB/Native/PDBFileBuilder.h
 llvm-devel/include/llvm/DebugInfo/PDB/Native/PDBStringTable.h
@@ -1981,6 +1987,7 @@ llvm-devel/include/llvm/IR/IntrinsicsHexagon.td
 llvm-devel/include/llvm/IR/IntrinsicsMips.td
 llvm-devel/include/llvm/IR/IntrinsicsNVVM.td
 llvm-devel/include/llvm/IR/IntrinsicsPowerPC.td
+llvm-devel/include/llvm/IR/IntrinsicsRISCV.td
 llvm-devel/include/llvm/IR/IntrinsicsSystemZ.td
 llvm-devel/include/llvm/IR/IntrinsicsWebAssembly.td
 llvm-devel/include/llvm/IR/IntrinsicsX%%LLVM_MAJOR%%6.td
@@ -2001,6 +2008,7 @@ llvm-devel/include/llvm/IR/NoFolder.h
 llvm-devel/include/llvm/IR/OperandTraits.h
 llvm-devel/include/llvm/IR/Operator.h
 llvm-devel/include/llvm/IR/OptBisect.h
+llvm-devel/include/llvm/IR/PassInstrumentation.h
 llvm-devel/include/llvm/IR/PassManager.h
 llvm-devel/include/llvm/IR/PassManagerInternal.h
 llvm-devel/include/llvm/IR/PassTimingInfo.h
@@ -2165,6 +2173,7 @@ llvm-devel/include/llvm/PassRegistry.h
 llvm-devel/include/llvm/PassSupport.h
 llvm-devel/include/llvm/Passes/PassBuilder.h
 llvm-devel/include/llvm/Passes/PassPlugin.h
+llvm-devel/include/llvm/Passes/StandardInstrumentations.h
 llvm-devel/include/llvm/ProfileData/Coverage/CoverageMapping.h
 llvm-devel/include/llvm/ProfileData/Coverage/CoverageMappingReader.h
 llvm-devel/include/llvm/ProfileData/Coverage/CoverageMappingWriter.h
@@ -2297,6 +2306,7 @@ llvm-devel/include/llvm/Support/SpecialCaseList.h
 llvm-devel/include/llvm/Support/StringPool.h
 llvm-devel/include/llvm/Support/StringSaver.h
 llvm-devel/include/llvm/Support/SwapByteOrder.h
+llvm-devel/include/llvm/Support/SymbolRemappingReader.h
 llvm-devel/include/llvm/Support/SystemUtils.h
 llvm-devel/include/llvm/Support/TarWriter.h
 llvm-devel/include/llvm/Support/TargetOpcodes.def
@@ -2729,7 +2739,6 @@ llvm-devel/lib/libLLVMBPFInfo.a
 llvm-devel/lib/libLLVMBinaryFormat.a
 llvm-devel/lib/libLLVMBitReader.a
 llvm-devel/lib/libLLVMBitWriter.a
-llvm-devel/lib/libLLVMCFIVerify.a
 llvm-devel/lib/libLLVMCodeGen.a
 llvm-devel/lib/libLLVMCore.a
 llvm-devel/lib/libLLVMCoroutines.a
@@ -2741,9 +2750,6 @@ llvm-devel/lib/libLLVMDebugInfoPDB.a
 llvm-devel/lib/libLLVMDemangle.a
 llvm-devel/lib/libLLVMDlltoolDriver.a
 llvm-devel/lib/libLLVMExecutionEngine.a
-llvm-devel/lib/libLLVMExegesis.a
-llvm-devel/lib/libLLVMExegesisAArch64.a
-llvm-devel/lib/libLLVMExegesisX%%LLVM_MAJOR%%6.a
 llvm-devel/lib/libLLVMFuzzMutate.a
 llvm-devel/lib/libLLVMGlobalISel.a
 llvm-devel/lib/libLLVMHexagonAsmParser.a
@@ -2766,7 +2772,6 @@ llvm-devel/lib/libLLVMLibDriver.a
 llvm-devel/lib/libLLVMLineEditor.a
 llvm-devel/lib/libLLVMLinker.a
 llvm-devel/lib/libLLVMMC.a
-llvm-devel/lib/libLLVMMCA.a
 llvm-devel/lib/libLLVMMCDisassembler.a
 llvm-devel/lib/libLLVMMCJIT.a
 llvm-devel/lib/libLLVMMCParser.a
@@ -2939,6 +2944,7 @@ llvm-devel/lib/libLTO.so.%%LLVM_MAJOR%%svn
 %%LLDB%%llvm-devel/lib/liblldbPluginABISysV_x%%LLVM_MAJOR%%6_64.a
 %%LLDB%%llvm-devel/lib/liblldbPluginAppleObjCRuntime.a
 %%LLDB%%llvm-devel/lib/liblldbPluginArchitectureArm.a
+%%LLDB%%llvm-devel/lib/liblldbPluginArchitectureMips.a
 %%LLDB%%llvm-devel/lib/liblldbPluginArchitecturePPC64.a
 %%LLDB%%llvm-devel/lib/liblldbPluginCPlusPlusLanguage.a
 %%LLDB%%llvm-devel/lib/liblldbPluginCXXItaniumABI.a