On 23 Oct 2024, at 21:40, Cy Schubert <cy.schub...@cschubert.com> wrote: > > In message <202410231832.49niwctj078...@gitrepo.freebsd.org>, Dimitry Andric > wr > ites: >> The branch main has been updated by dim: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=5deeebd8c6ca991269e72902a7a62cad >> a57947f6 >> >> commit 5deeebd8c6ca991269e72902a7a62cada57947f6 >> Merge: 6e516c87b6d7 e6b732792813 >> Author: Dimitry Andric <d...@freebsd.org> >> AuthorDate: 2024-10-21 12:59:26 +0000 >> Commit: Dimitry Andric <d...@freebsd.org> >> CommitDate: 2024-10-23 18:27:38 +0000 >> >> Merge llvm-project release/19.x llvmorg-19.1.2-0-g7ba7d8e2f7b6 >> >> This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and >> openmp to llvm-project release/19.x llvmorg-19.1.2-0-g7ba7d8e2f7b6, >> a.k.a. 19.1.2 release. >> >> PR: 280562 >> MFC after: 1 month >> >> .../clang/include/clang/Basic/TokenKinds.def | 5 +- >> contrib/llvm-project/clang/lib/CodeGen/CGCall.cpp | 31 ++-- >> contrib/llvm-project/clang/lib/CodeGen/CGClass.cpp | 2 +- >> contrib/llvm-project/clang/lib/CodeGen/CGExpr.cpp | 16 +- >> .../clang/lib/CodeGen/CodeGenModule.cpp | 15 +- >> .../llvm-project/clang/lib/CodeGen/CodeGenModule.h | 5 +- >> .../llvm-project/clang/lib/CodeGen/CodeGenTBAA.cpp | 13 +- >> .../llvm-project/clang/lib/CodeGen/CodeGenTBAA.h | 5 +- >> .../clang/lib/CodeGen/CodeGenTypes.cpp | 7 +- >> .../llvm-project/clang/lib/CodeGen/CodeGenTypes.h | 8 +- >> .../clang/lib/CodeGen/MicrosoftCXXABI.cpp | 2 +- >> .../clang/lib/Format/TokenAnnotator.cpp | 42 ++--- >> .../clang/lib/Format/UnwrappedLineParser.cpp | 17 +- >> contrib/llvm-project/clang/lib/Headers/intrin0.h | 2 +- >> contrib/llvm-project/clang/lib/Headers/vecintrin.h | 28 +++- >> .../clang/lib/Lex/PPMacroExpansion.cpp | 52 +++--- >> contrib/llvm-project/clang/lib/Sema/SemaExpr.cpp | 3 +- >> .../llvm-project/clang/lib/Sema/TreeTransform.h | 2 +- >> .../compiler-rt/lib/fuzzer/FuzzerUtilWindows.cpp | 5 + >> .../sanitizer_common_interceptors.inc | 180 ------------------- >> -- >> .../sanitizer_platform_interceptors.h | 2 - >> contrib/llvm-project/libcxx/include/__config | 2 +- >> contrib/llvm-project/libcxx/include/version | 7 +- >> contrib/llvm-project/lld/ELF/Arch/Hexagon.cpp | 20 ++- >> .../llvm/include/llvm/CodeGen/FastISel.h | 3 + >> .../llvm/lib/CodeGen/SelectionDAG/FastISel.cpp | 12 +- >> .../llvm/lib/Target/X86/X86FastISel.cpp | 4 +- >> .../llvm/lib/Target/X86/X86ISelLowering.cpp | 13 +- >> .../Transforms/InstCombine/InstCombineAndOrXor.cpp | 18 ++- >> .../lib/Transforms/Vectorize/VectorCombine.cpp | 59 +++---- >> lib/clang/include/VCSVersion.inc | 6 +- >> lib/clang/include/clang/Basic/Version.inc | 6 +- >> lib/clang/include/lld/Common/Version.inc | 2 +- >> lib/clang/include/lldb/Version/Version.inc | 6 +- >> lib/clang/include/llvm/Config/config.h | 4 +- >> lib/clang/include/llvm/Config/llvm-config.h | 4 +- >> lib/clang/include/llvm/Support/VCSRevision.h | 2 +- >> 37 files changed, 260 insertions(+), 350 deletions(-) >> > > Hi, > > One of these commits fails to build. > > c++ -O2 -pipe -pipe -fno-common > -I/export/obj/opt/src/git-src/amd64.amd64/tmp/obj-tools/lib/clang/libllvm > -I/opt/src/git-src/sys/contrib/zstd/lib > -I/opt/src/git-src/contrib/llvm-project/llvm/lib/Target/X86 > -I/opt/src/git-src/contrib/llvm-project/llvm/lib/ObjCopy -DBLA > KE3_USE_NEON=0 -I/opt/src/git-src/lib/clang/include > -I/opt/src/git-src/contrib/llvm-project/llvm/include -D__STDC_CONSTANT_MACROS > -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -DHAVE_VCS_VERSION_INC -DNDEBUG > -DLLVM_DEFAULT_TARGET_TRIPLE=\"x86_64-unknown-freebsd15.0\" -D > LLVM_HOST_TRIPLE=\"x86_64-unknown-freebsd15.0\" > -DDEFAULT_SYSROOT=\"/export/obj/opt/src/git-src/amd64.amd64/tmp\" > -DLLVM_TARGET_ENABLE_X86 -DLLVM_NATIVE_ASMPARSER=LLVMInitializeX86AsmParser > -DLLVM_NATIVE_ASMPRINTER=LLVMInitializeX86AsmPrinter > -DLLVM_NATIVE_DISASSEMBLER > =LLVMInitializeX86Disassembler -DLLVM_NATIVE_TARGET=LLVMInitializeX86Target > -DLLVM_NATIVE_TARGETINFO=LLVMInitializeX86TargetInfo > -DLLVM_NATIVE_TARGETMC=LLVMInitializeX86TargetMC -ffunction-sections > -fdata-sections -gline-tables-only -Wno-format-zero-length -Wdate-time > -Wno-empty-body -Wno-string-plus-int -Wno-unused-const-variable > -Wno-error=unused-but-set-parameter -Wno-tautological-compare > -Wno-unused-value -Wno-parentheses-equality -Wno-unused-function > -Wno-enum-conversion -Wno-unused-local-typedef -Wno-address-of-packed-member - > Wno-switch -Wno-switch-enum -Wno-knr-promoted-parameter -Wno-parentheses > -Qunused-arguments > -I/export/obj/opt/src/git-src/amd64.amd64/tmp/legacy/usr/include > -fno-exceptions -fno-rtti -gline-tables-only -std=c++17 -stdlib=libc++ > -Wno-c++11-extensions -c /opt/src/ > git-src/contrib/llvm-project/llvm/lib/CodeGen/ShadowStackGCLowering.cpp -o > CodeGen/ShadowStackGCLowering.o > /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:921:13: > error: no member named 'VerifyDAGDivergence' in 'llvm::SelectionDAG' > 921 | CurDAG->VerifyDAGDivergence(); > | ~~~~~~ ^ > /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:941:13: > error: no member named 'VerifyDAGDivergence' in 'llvm::SelectionDAG' > 941 | CurDAG->VerifyDAGDivergence(); > | ~~~~~~ ^ > /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:963:13: > error: no member named 'VerifyDAGDivergence' in 'llvm::SelectionDAG' > 963 | CurDAG->VerifyDAGDivergence(); > | ~~~~~~ ^ > /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:987:15: > error: no member named 'VerifyDAGDivergence' in 'llvm::SelectionDAG' > 987 | CurDAG->VerifyDAGDivergence(); > | ~~~~~~ ^ > /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1005:15: > error: no member named 'VerifyDAGDivergence' in 'llvm::SelectionDAG' > 1005 | CurDAG->VerifyDAGDivergence(); > | ~~~~~~ ^ > /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1021:15: > error: no member named 'VerifyDAGDivergence' in 'llvm::SelectionDAG' > 1021 | CurDAG->VerifyDAGDivergence(); > | ~~~~~~ ^ > /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1041:15: > error: no member named 'VerifyDAGDivergence' in 'llvm::SelectionDAG' > 1041 | CurDAG->VerifyDAGDivergence(); > | ~~~~~~ ^ > /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1061:13: > error: no member named 'VerifyDAGDivergence' in 'llvm::SelectionDAG' > 1061 | CurDAG->VerifyDAGDivergence(); > | ~~~~~~ ^ > /opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1081:13: > error: no member named 'VerifyDAGDivergence' in 'llvm::SelectionDAG' > 1081 | CurDAG->VerifyDAGDivergence(); > | ~~~~~~ ^
I haven't fully universe-tested each and every individual squashed merge, so please use only the last one. If that one doesn't build, I would be amazed, since it has gone through more than one universe build. That said, some exotic configurations might not build. Do you have any special make.conf or src.conf settings? -Dimitry
